[med-svn] r14128 - in trunk/packages/mcl/trunk/debian: . patches

[Philipp Benner]

Author: philipp
Date: 2013-07-09 16:46:31 +0000 (Tue, 09 Jul 2013)
New Revision: 14128

Added:
   trunk/packages/mcl/trunk/debian/patches/03-mayhem-io.patch
   trunk/packages/mcl/trunk/debian/patches/04-mayhem-vector.patch
Modified:
   trunk/packages/mcl/trunk/debian/changelog
   trunk/packages/mcl/trunk/debian/control
   trunk/packages/mcl/trunk/debian/patches/series
Log:
mcl: mayhem bugfixes

Modified: trunk/packages/mcl/trunk/debian/changelog
===================================================================
--- trunk/packages/mcl/trunk/debian/changelog	2013-07-09 13:57:03 UTC (rev 14127)
+++ trunk/packages/mcl/trunk/debian/changelog	2013-07-09 16:46:31 UTC (rev 14128)
@@ -1,3 +1,10 @@
+mcl (1:12-135-2) unstable; urgency=low
+
+  * Added mayhem bugfixes.
+  * Standards version 3.9.4.
+
+ -- Philipp Benner <philipp at debian.org>  Sun, 07 Jul 2013 15:01:08 +0200
+
 mcl (1:12-135-1) unstable; urgency=low
 
   [ Andreas Tille ]

Modified: trunk/packages/mcl/trunk/debian/control
===================================================================
--- trunk/packages/mcl/trunk/debian/control	2013-07-09 13:57:03 UTC (rev 14127)
+++ trunk/packages/mcl/trunk/debian/control	2013-07-09 16:46:31 UTC (rev 14128)
@@ -5,7 +5,7 @@
 Uploaders: Philipp Benner <philipp at debian.org>,
  Andreas Tille <tille at debian.org>
 Build-Depends: debhelper (>= 7), dpkg-dev (>= 1.16.1~), autotools-dev, quilt, zoem, tidy
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/mcl/
 Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/mcl/
 Homepage: http://micans.org/mcl/

Added: trunk/packages/mcl/trunk/debian/patches/03-mayhem-io.patch
===================================================================
--- trunk/packages/mcl/trunk/debian/patches/03-mayhem-io.patch	                        (rev 0)
+++ trunk/packages/mcl/trunk/debian/patches/03-mayhem-io.patch	2013-07-09 16:46:31 UTC (rev 14128)
@@ -0,0 +1,37 @@
+--- a/src/impala/io.c
++++ b/src/impala/io.c
+@@ -380,6 +380,7 @@
+ )
+    {  unsigned char format = '0'
+    ;  mclxIOinfo* info = mclxIOinfofy(xf)
++   ;  mclp ivp
+    
+    ;  if (!info || mcxIOtestOpen(xf, RETURN_ON_FAIL) != STATUS_OK)
+       {  if (!info)
+@@ -395,9 +396,23 @@
+ 
+       if (mcxIOtryCookie(xf, mclxCookie))
+       {  format = 'b'
+-      ;  fread(pn_cols, sizeof(long), 1, xf->fp)
+-      ;  fread(pn_rows, sizeof(long), 1, xf->fp)
+-      ;  info->n_read += 2 * sizeof(long)
++      ;  if
++         (  1 != fread(pn_cols, sizeof(long), 1, xf->fp)
++         || 1 != fread(pn_rows, sizeof(long), 1, xf->fp)
++         || pn_cols[0] < 0
++         || DIM_MAX / sizeof ivp < pn_cols[0]
++         || pn_rows[0] < 0
++         || DIM_MAX / sizeof ivp < pn_rows[0]
++         )
++         {  mcxErr
++            (  "mclxReadDimensions"
++            ,  "dimensions corrupt or too large (have %ld %ld)"
++            ,  (long) pn_cols[0]
++            ,  (long) pn_rows[0]
++            )
++         ;  return STATUS_FAIL
++      ;  }
++         info->n_read += 2 * sizeof(long)
+    ;  }
+       else if (mclxa_read_dimpart(xf, pn_cols, pn_rows) == STATUS_OK)
+       format = 'a'

Added: trunk/packages/mcl/trunk/debian/patches/04-mayhem-vector.patch
===================================================================
--- trunk/packages/mcl/trunk/debian/patches/04-mayhem-vector.patch	                        (rev 0)
+++ trunk/packages/mcl/trunk/debian/patches/04-mayhem-vector.patch	2013-07-09 16:46:31 UTC (rev 14128)
@@ -0,0 +1,13 @@
+--- a/src/impala/vector.c	2013-07-09 11:05:22.084990745 +0100
++++ b/src/impala/vector.c	2013-07-09 11:05:51.940525340 +0100
+@@ -139,7 +139,9 @@
+                                     /* I've had a suspicion that some reallocs might be too lazy
+                                      * to reuse shrunk array space.
+                                     */
+-   ;  if (old_n_ivps / 2 > new_n_ivps)
++   ;  if (DIM_MAX / sizeof new_ivps[0] < new_n_ivps)
++   /*  DO NOTHING, enter mcxMemDenied below */
++   ;  else if (old_n_ivps / 2 > new_n_ivps)
+       {  new_ivps = mcxAlloc(new_n_ivps * sizeof new_ivps[0], ENQUIRE_ON_FAIL)
+       ;  if (new_ivps && !src_ivps)
+          memcpy(new_ivps, dst_vec->ivps, new_n_ivps * sizeof new_ivps[0])

Modified: trunk/packages/mcl/trunk/debian/patches/series
===================================================================
--- trunk/packages/mcl/trunk/debian/patches/series	2013-07-09 13:57:03 UTC (rev 14127)
+++ trunk/packages/mcl/trunk/debian/patches/series	2013-07-09 16:46:31 UTC (rev 14128)
@@ -1,2 +1,4 @@
 01-restrict-variables.patch
 02-wrong-interpreter-path.patch
+03-mayhem-io.patch
+04-mayhem-vector.patch