[maemo-commits] [maemo-commits] r17287 - in projects/haf/trunk/dosfstools/debian: . patches

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-01-27 10:11:13 +0200 (Tue, 27 Jan 2009)
New Revision: 17287

Added:
   projects/haf/trunk/dosfstools/debian/patches/13-dosfsck-alloc-errno.patch
Modified:
   projects/haf/trunk/dosfstools/debian/changelog
   projects/haf/trunk/dosfstools/debian/patches/series
Log:
add patch for misleading malloc() error


Modified: projects/haf/trunk/dosfstools/debian/changelog
===================================================================
--- projects/haf/trunk/dosfstools/debian/changelog	2009-01-27 07:56:01 UTC (rev 17286)
+++ projects/haf/trunk/dosfstools/debian/changelog	2009-01-27 08:11:13 UTC (rev 17287)
@@ -9,6 +9,7 @@
 
   Kimmo:
   * Keep using cdbs, now fortified with quilt.
+  * Add patch for misleading malloc error from Olev. Fixes: NB#91950
 
  -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Tue, 27 Jan 2009 09:35:54 +0200
 

Added: projects/haf/trunk/dosfstools/debian/patches/13-dosfsck-alloc-errno.patch
===================================================================
--- projects/haf/trunk/dosfstools/debian/patches/13-dosfsck-alloc-errno.patch	2009-01-27 07:56:01 UTC (rev 17286)
+++ projects/haf/trunk/dosfstools/debian/patches/13-dosfsck-alloc-errno.patch	2009-01-27 08:11:13 UTC (rev 17287)
@@ -0,0 +1,14 @@
+diff -pur dosfstools-3.0.1/src/common.c dosfstools-3.0.1.new/src/common.c
+--- dosfstools-3.0.1/src/common.c	2008-09-28 13:06:37.000000000 +0300
++++ dosfstools-3.0.1.new/src/common.c	2009-01-27 10:07:42.000000000 +0200
+@@ -68,6 +68,9 @@ void *alloc(int size)
+     void *this;
+ 
+     if ((this = malloc(size))) return this;
++    if (errno == 0) {
++	errno = ENOMEM;
++    }
+     pdie("malloc");
+     return NULL; /* for GCC */
+ }
+Only in dosfstools-3.0.1.new/src: common.c.orig

Modified: projects/haf/trunk/dosfstools/debian/patches/series
===================================================================
--- projects/haf/trunk/dosfstools/debian/patches/series	2009-01-27 07:56:01 UTC (rev 17286)
+++ projects/haf/trunk/dosfstools/debian/patches/series	2009-01-27 08:11:13 UTC (rev 17287)
@@ -8,3 +8,4 @@
 10-dosfsck-memsaves.patch
 11-ignore-fs_close-return-value.patch
 12-make-autorenaming-counter-static.patch
+13-dosfsck-alloc-errno.patch