From c753a09c44a088f43490349be0bccffd076a6617 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 22 Apr 2013 11:13:01 +0200 Subject: gd: drop uneeded patch --- gd-sa3.patch | 31 ------------------------------- gd.spec | 2 -- 2 files changed, 33 deletions(-) delete mode 100644 gd-sa3.patch diff --git a/gd-sa3.patch b/gd-sa3.patch deleted file mode 100644 index 62ee2ea..0000000 --- a/gd-sa3.patch +++ /dev/null @@ -1,31 +0,0 @@ -The following issue has been found by Coverity static analysis tool. - -Error: STRING_OVERFLOW (CWE-120): [#def53] -gd-2.0.35/annotate.c:42: cond_false: Condition "argc != 3", taking false branch -gd-2.0.35/annotate.c:60: if_end: End of if statement -gd-2.0.35/annotate.c:64: cond_false: Condition "!in", taking false branch -gd-2.0.35/annotate.c:68: if_end: End of if statement -gd-2.0.35/annotate.c:75: cond_false: Condition "!im", taking false branch -gd-2.0.35/annotate.c:79: if_end: End of if statement -gd-2.0.35/annotate.c:80: cond_true: Condition "fgets(s, 1024 /* sizeof (s) */, stdin)", taking true branch -gd-2.0.35/annotate.c:85: cond_false: Condition "!st", taking false branch -gd-2.0.35/annotate.c:89: if_end: End of if statement -gd-2.0.35/annotate.c:90: cond_true: Condition "!__coverity_strcmp(st, "font")", taking true branch -gd-2.0.35/annotate.c:93: cond_false: Condition "!st", taking false branch -gd-2.0.35/annotate.c:96: if_end: End of if statement -gd-2.0.35/annotate.c:97: fixed_size_dest: You might overrun the 1024 byte fixed-size string "font" by copying "st" without checking the length. - -diff -up gd-2.0.35/annotate.c.sa3 gd-2.0.35/annotate.c ---- gd-2.0.35/annotate.c.sa3 2012-12-05 17:26:21.157729019 +0100 -+++ gd-2.0.35/annotate.c 2012-12-05 17:27:31.762762209 +0100 -@@ -94,6 +94,10 @@ main (int argc, char *argv[]) - { - goto badLine; - } -+ if (strlen(st) >= sizeof(font) - 1) -+ { -+ goto badLine; -+ } - strcpy (font, st); - } - else if (!strcmp (st, "align")) diff --git a/gd.spec b/gd.spec index 7397903..ba8160b 100644 --- a/gd.spec +++ b/gd.spec @@ -18,7 +18,6 @@ Patch8: gd-2.0.33-BoxBound.patch Patch10: gd-2.0.35-time.patch Patch12: gd-2.0.35-runtests.patch Patch13: gd-sa1.patch -Patch15: gd-sa3.patch Patch16: gd-sa4.patch Patch17: gd-aarch64.patch @@ -85,7 +84,6 @@ files for gd, a graphics library for creating PNG and JPEG graphics. #patch10 -p1 -b .time #patch12 -p1 -b .runtests #patch13 -p1 -b .sa1 -#patch15 -p1 -b .sa3 #patch16 -p1 -b .sa4 #patch17 -p1 -b .aarch64 -- cgit