From a5196bcdafbc702eb74b5da5965e3164f275fd57 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 14 May 2014 12:56:38 +0000 Subject: main/dev86: upgrade to 0.16.21 --- main/dev86/dev86-print-overflow.patch | 27 --------------------------- 1 file changed, 27 deletions(-) delete mode 100644 main/dev86/dev86-print-overflow.patch (limited to 'main/dev86/dev86-print-overflow.patch') diff --git a/main/dev86/dev86-print-overflow.patch b/main/dev86/dev86-print-overflow.patch deleted file mode 100644 index c75e18c9bb..0000000000 --- a/main/dev86/dev86-print-overflow.patch +++ /dev/null @@ -1,27 +0,0 @@ -From: Lubomir Rintel - -There are off-by-one errors when filling the ar headers, the trailing nul -would overflow the target buffer. - -diff -urp dev86-0.16.17/ld/mkar.c dev86-0.16.17.fixed/ld/mkar.c ---- dev86-0.16.17/ld/mkar.c 2004-06-20 09:23:27.000000000 +0200 -+++ dev86-0.16.17.fixed/ld/mkar.c 2010-03-29 23:34:30.351426404 +0200 -@@ -51,12 +51,12 @@ char buf[128]; - memset(&arbuf, ' ', sizeof(arbuf)); - strcpy(buf, ptr); strcat(buf, "/ "); - strncpy(arbuf.ar_name, buf, sizeof(arbuf.ar_name)); -- -- sprintf(arbuf.ar_date, "%-12ld", (long)st.st_mtime); -- sprintf(arbuf.ar_uid, "%-6d", (int)(st.st_uid%1000000L)); -- sprintf(arbuf.ar_gid, "%-6d", (int)(st.st_gid%1000000L)); -- sprintf(arbuf.ar_mode, "%-8lo", (long)st.st_mode); -- sprintf(arbuf.ar_size, "%-10ld", (long)st.st_size); -+ -+ snprintf(arbuf.ar_date, 12, "%-12ld", (long)st.st_mtime); -+ snprintf(arbuf.ar_uid, 6, "%-6d", (int)(st.st_uid%1000000L)); -+ snprintf(arbuf.ar_gid, 6, "%-6d", (int)(st.st_gid%1000000L)); -+ snprintf(arbuf.ar_mode, 8, "%-8lo", (long)st.st_mode); -+ snprintf(arbuf.ar_size, 10, "%-10ld", (long)st.st_size); - memcpy(arbuf.ar_fmag, ARFMAG, sizeof(arbuf.ar_fmag)); - - if( fwrite(&arbuf, 1, sizeof(arbuf), fd) != sizeof(arbuf) ) -- cgit v1.2.3