[med-svn] r16425 - trunk/packages/staden-io-lib/trunk/debian/patches

[Charles Plessy]

Author: plessy
Date: 2014-03-11 23:05:36 +0000 (Tue, 11 Mar 2014)
New Revision: 16425

Removed:
   trunk/packages/staden-io-lib/trunk/debian/patches/fix_bufferoverflow.patch
Modified:
   trunk/packages/staden-io-lib/trunk/debian/patches/series
Log:
Removed patch applied upstream.


Deleted: trunk/packages/staden-io-lib/trunk/debian/patches/fix_bufferoverflow.patch
===================================================================
--- trunk/packages/staden-io-lib/trunk/debian/patches/fix_bufferoverflow.patch	2014-03-11 22:01:36 UTC (rev 16424)
+++ trunk/packages/staden-io-lib/trunk/debian/patches/fix_bufferoverflow.patch	2014-03-11 23:05:36 UTC (rev 16425)
@@ -1,33 +0,0 @@
-Author: James Bonfield <jkb at sanger.ac.uk>
-Last-Update: Mon, 9 Dec 2013 10:07:49 +0000
-Bug-Debian: http://bugs.debian.org/729276
-Upstream: http://sourceforge.net/p/staden/code/3529/
-Description: Fix buffer overflow
-
---- a/progs/index_tar.c
-+++ b/progs/index_tar.c
-@@ -80,7 +80,7 @@ int main(int argc, char **argv) {
-     int directories = 0;
-     FILE *fp;
-     tar_block blk;
--    char member[256];
-+    char member[257];
-     size_t size, extra;
-     int LongLink = 0;
-     size_t offset = 0;
-@@ -127,10 +127,14 @@ int main(int argc, char **argv) {
- 	     * was ././@LongLink
- 	     */
-             if (LongLink == 0) {
-+		char *cp;
-                 (void) strncpy(member, blk.header.prefix, 155);
-+		member[155] = 0;
- 	        if (strlen(blk.header.prefix) > 0 && blk.header.name[0])
- 		    (void) strcat(member, "/");
--    	        (void) strncat(member, blk.header.name, 100);
-+		cp = member + strlen(member);
-+    	        (void) strncpy(cp, blk.header.name, 100);
-+		cp[100] = 0;
-             }
-             
-             /* account for gtar ././@LongLink */

Modified: trunk/packages/staden-io-lib/trunk/debian/patches/series
===================================================================
--- trunk/packages/staden-io-lib/trunk/debian/patches/series	2014-03-11 22:01:36 UTC (rev 16424)
+++ trunk/packages/staden-io-lib/trunk/debian/patches/series	2014-03-11 23:05:36 UTC (rev 16425)
@@ -1,2 +1 @@
 pathmax.patch
-fix_bufferoverflow.patch