From c2c2499862e2627172eb85cdffce262fe173e454 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Sun, 28 Sep 2008 19:39:00 +0000 Subject: [PATCH] Bug fix: Potential buffer overflow introduced with revision 2024 --- cdrskin/cdrskin_timestamp.h | 2 +- libburn/spc.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/cdrskin/cdrskin_timestamp.h b/cdrskin/cdrskin_timestamp.h index e98f1ec..1e7c017 100644 --- a/cdrskin/cdrskin_timestamp.h +++ b/cdrskin/cdrskin_timestamp.h @@ -1 +1 @@ -#define Cdrskin_timestamP "2008.09.16.060250" +#define Cdrskin_timestamP "2008.09.28.193802" diff --git a/libburn/spc.c b/libburn/spc.c index 1b79929..bacf659 100644 --- a/libburn/spc.c +++ b/libburn/spc.c @@ -1045,7 +1045,7 @@ enum response scsi_error_msg(struct burn_drive *d, unsigned char *sense, break; return FAIL; case 0x30: - if (*key != 2) + if (*key != 2 && *key != 5) break; if (*ascq == 1) sprintf(msg, "Cannot read medium, unknown format"); @@ -1151,8 +1151,7 @@ int scsi_notify_error(struct burn_drive *d, struct command *c, if (d->silent_on_scsi_error) return 1; - scsi_error_msg(d, sense, senselen, scsi_msg + strlen(scsi_msg), - &key, &asc, &ascq); + scsi_error_msg(d, sense, senselen, scsi_msg, &key, &asc, &ascq); if (!(flag & 1)) { /* SPC : TEST UNIT READY command */