[Pkg-libburnia-commits] r279 - in trunk/libisoburn/debian: . patches

[George Danchev]

Author: danchev
Date: 2012-07-30 07:34:57 +0000 (Mon, 30 Jul 2012)
New Revision: 279

Added:
   trunk/libisoburn/debian/patches/
   trunk/libisoburn/debian/patches/SIGSEGV-by-uninitialized-local-variable
   trunk/libisoburn/debian/patches/series
Modified:
   trunk/libisoburn/debian/changelog
Log:
patch to fix a SIGSEGV

Modified: trunk/libisoburn/debian/changelog
===================================================================
--- trunk/libisoburn/debian/changelog	2012-07-12 06:14:54 UTC (rev 278)
+++ trunk/libisoburn/debian/changelog	2012-07-30 07:34:57 UTC (rev 279)
@@ -1,3 +1,12 @@
+libisoburn (1.2.2-2) unstable; urgency=low
+
+  * Bug fix patch: SIGSEGV-by-uninitialized-local-variable
+    Prevent a SIGSEGV due to usage of uninitialized local variable
+    with -check_media patch_lba0="on" option. Regression introduced
+    by version 1.0.6 (Closes: #683248)
+
+ -- George Danchev <danchev at spnet.net>  Fri, 27 Jul 2012 10:26:57 +0200
+
 libisoburn (1.2.2-1) unstable; urgency=low
 
   * New upstream release

Added: trunk/libisoburn/debian/patches/SIGSEGV-by-uninitialized-local-variable
===================================================================
--- trunk/libisoburn/debian/patches/SIGSEGV-by-uninitialized-local-variable	                        (rev 0)
+++ trunk/libisoburn/debian/patches/SIGSEGV-by-uninitialized-local-variable	2012-07-30 07:34:57 UTC (rev 279)
@@ -0,0 +1,57 @@
+Description: SIGSEGV by uninitialized local variable with -check_media patch_lba0="on"
+ The fix is worthwhile, because the bug is nasty albeit rarely occuring.
+ I encountered a SIGSEGV by dereferring NULL, but it could have been any
+ other random stack value instead. So the bug has some potential.
+ The risk of introducing regressions is low.
+Author: Thomas Schmitt <scdbackup at gmx.net>
+Origin: upstream, http://libburnia-project.org/changeset/4809
+Bug-Debian: http://bugs.debian.org/683248
+Forwarded: not-needed
+Reviewed-By: George Danchev <danchev at spnet.net>
+Last-Update: 2012-30-07
+
+--- libisoburn-1.2.2.orig/xorriso/write_run.c
++++ libisoburn-1.2.2/xorriso/write_run.c
+@@ -2357,7 +2357,7 @@ int Xorriso_update_iso_lba0(struct Xorri
+  int ret, full_size, i;
+  char *headpt;
+  struct burn_drive_info *dinfo;
+- struct burn_drive *drive;
++ struct burn_drive *drive = NULL;
+  off_t seek_ret, to_write;
+  int tag_type;
+  uint32_t pos, range_start, range_size, next_tag;
+@@ -2387,8 +2387,9 @@ int Xorriso_update_iso_lba0(struct Xorri
+ 
+  if(!(flag & 2)) {
+    /* head_buffer was not filled yet. Read it from output media. */
+-   if(burn_drive_get_drive_role(drive) == 5) /* write-only */
+-     return(2);
++   if(drive != NULL)
++     if(burn_drive_get_drive_role(drive) == 5) /* write-only */
++       return(2);
+    if(job != NULL && job->data_to_fd >= 0) {
+      if((flag & 8) && job->sector_map != NULL) {
+        ret= Sectorbitmap_bytes_are_set(job->sector_map,
+@@ -2416,16 +2417,18 @@ int Xorriso_update_iso_lba0(struct Xorri
+        Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, errno, "FAILURE",0);
+        return(0);
+      }
+-     ret= isoburn_read_iso_head(drive, 0, &isosize, head_buffer, 1 << 13);
++     ret= isoburn_read_iso_head(NULL, 0, &isosize, head_buffer, 1 << 13);
+      if(ret<=0) {
+        Xorriso_process_msg_queues(xorriso,0);
+        sprintf(xorriso->info_text,
+-               "Alleged session start does not like ISO 9660.");
++               "Alleged session start does not look like ISO 9660.");
+        Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, errno, "FAILURE",0);
+        return(0);
+      }
+    } else {
+-     ret= isoburn_read_iso_head(drive, iso_lba, &isosize, head_buffer, 2);
++     ret= 0;
++     if(drive != NULL)
++       ret= isoburn_read_iso_head(drive, iso_lba, &isosize, head_buffer, 2);
+      if(ret<=0) {
+        Xorriso_process_msg_queues(xorriso,0);
+        sprintf(xorriso->info_text,

Added: trunk/libisoburn/debian/patches/series
===================================================================
--- trunk/libisoburn/debian/patches/series	                        (rev 0)
+++ trunk/libisoburn/debian/patches/series	2012-07-30 07:34:57 UTC (rev 279)
@@ -0,0 +1 @@
+SIGSEGV-by-uninitialized-local-variable