From 82ee4c87881588ddcc753d3ed836909d6bae8747 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Fri, 18 Sep 2009 16:16:56 +0000 Subject: [PATCH] Fixing SIGSEGV with CD SAO introduced with revision 2808 --- cdrskin/cdrskin_timestamp.h | 2 +- libburn/sector.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/cdrskin/cdrskin_timestamp.h b/cdrskin/cdrskin_timestamp.h index b6dcc70..7f308a5 100644 --- a/cdrskin/cdrskin_timestamp.h +++ b/cdrskin/cdrskin_timestamp.h @@ -1 +1 @@ -#define Cdrskin_timestamP "2009.09.13.095055" +#define Cdrskin_timestamP "2009.09.18.161214" diff --git a/libburn/sector.c b/libburn/sector.c index 5647d21..8a56fcc 100644 --- a/libburn/sector.c +++ b/libburn/sector.c @@ -302,13 +302,15 @@ static int convert_data(struct burn_write_opts *o, struct burn_track *track, if ((outmode & BURN_MODE_BITS) == (inmode & BURN_MODE_BITS)) { /* see MMC-5 4.2.3.8.5.3 Block Format for Mode 2 form 1 Data Table 24 Mode 2 Formed Sector Sub-header Format */ - if (track->cdxa_conversion == 1) - inlen += 8; + if (track != NULL) + if (track->cdxa_conversion == 1) + inlen += 8; get_bytes(track, inlen, data); - if (track->cdxa_conversion == 1) - memmove(data, data + 8, inlen - 8); + if (track != NULL) + if (track->cdxa_conversion == 1) + memmove(data, data + 8, inlen - 8); return 1; }