[maemo-commits] [maemo-commits] r15271 - projects/haf/trunk/dosfstools/debian/patches

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2008-03-10 09:31:00 +0200 (Mon, 10 Mar 2008)
New Revision: 15271

Modified:
   projects/haf/trunk/dosfstools/debian/patches/10-dosfsck-memsaves.patch
Log:
memory alignment fix for Eero's patch


Modified: projects/haf/trunk/dosfstools/debian/patches/10-dosfsck-memsaves.patch
===================================================================
--- projects/haf/trunk/dosfstools/debian/patches/10-dosfsck-memsaves.patch	2008-03-07 07:40:14 UTC (rev 15270)
+++ projects/haf/trunk/dosfstools/debian/patches/10-dosfsck-memsaves.patch	2008-03-10 07:31:00 UTC (rev 15271)
@@ -16,7 +16,7 @@
  /* Like alloc, but registers the data area in a list described by ROOT. */
  
 --- dosfstools-2.11/dosfsck/common.c.orig	2003-05-15 21:39:16.000000000 +0300
-+++ dosfstools-2.11/dosfsck/common.c	2008-02-20 17:51:02.000000000 +0200
++++ dosfstools-2.11/dosfsck/common.c	2008-03-05 15:15:55.000000000 +0200
 @@ -5,6 +5,10 @@
  /* FAT32, VFAT, Atari format support, and various fixes additions May 1998
   * by Roman Hodek <Roman.Hodek at informatik.uni-erlangen.de> */
@@ -51,7 +51,7 @@
  {
      void *this;
  
-@@ -55,14 +66,50 @@
+@@ -55,14 +66,52 @@
  }
  
  
@@ -66,6 +66,8 @@
 +    if (size > MIN_ALLOC_FROM_BLOCK) {
 +	 return NULL;
 +    }
++    /* dosfsck doesn't use doubles, so it's safe to align just to 4 */
++    size = (size+3) & ~3;
 +    if (!block_head || block_head + size > block_end) {
 +        LINK *link = alloc(sizeof(LINK));
 +        link->next = *root;
@@ -107,7 +109,7 @@
  }
  
  
-@@ -76,6 +123,7 @@
+@@ -76,6 +125,7 @@
  	free(this->data);
  	free(this);
      }