From 352a33d287eee5034e4ce7e8929e9f416760bdb4 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Thu, 29 Oct 2015 08:19:32 +0000 Subject: [PATCH] Cared for an improbable error case. Coverity CID 21784. --- cdrskin/cdrskin.c | 6 +++++- cdrskin/cdrskin_timestamp.h | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cdrskin/cdrskin.c b/cdrskin/cdrskin.c index f00a2d5..f9bde34 100644 --- a/cdrskin/cdrskin.c +++ b/cdrskin/cdrskin.c @@ -3832,9 +3832,13 @@ int Cdrskin_assert_driveno(struct CdrskiN *skin, int flag) int Cdrskin_get_device_adr(struct CdrskiN *skin, char **device_adr, char **raw_adr, int *no_convert_fs_adr, int flag) { + int ret; + if(skin->driveno < 0 || (unsigned int) skin->driveno >= skin->n_drives) return(0); - burn_drive_get_adr(&skin->drives[skin->driveno],skin->device_adr); + ret= burn_drive_get_adr(&skin->drives[skin->driveno],skin->device_adr); + if(ret <= 0) + return(0); *device_adr= skin->device_adr; *raw_adr= skin->preskin->raw_device_adr; *no_convert_fs_adr= skin->preskin->no_convert_fs_adr; diff --git a/cdrskin/cdrskin_timestamp.h b/cdrskin/cdrskin_timestamp.h index 21d7dd2..c1b9712 100644 --- a/cdrskin/cdrskin_timestamp.h +++ b/cdrskin/cdrskin_timestamp.h @@ -1 +1 @@ -#define Cdrskin_timestamP "2015.10.28.192331" +#define Cdrskin_timestamP "2015.10.29.082150"