RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 18-Jun-2008 21:46:39 Branch: rpm-4_5 Handle: 2008061819463800 Modified files: (Branch: rpm-4_5) rpm CHANGES rpm/build parsePreamble.c Log: - fix: allocate Icon: buffer after iconsize is initialized. Summary: Revision Changes Path 1.1360.2.110+1 -0 rpm/CHANGES 2.124.2.3 +2 -1 rpm/build/parsePreamble.c ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/CHANGES ============================================================================ $ cvs diff -u -r1.1360.2.109 -r1.1360.2.110 CHANGES --- rpm/CHANGES 16 Jun 2008 17:59:51 -0000 1.1360.2.109 +++ rpm/CHANGES 18 Jun 2008 19:46:38 -0000 1.1360.2.110 @@ -1,4 +1,5 @@ 4.4.9 -> 4.5: + - jbj: fix: allocate Icon: buffer after iconsize is initialized. - jbj: fix: skip %exclude/%ghost files to get more accurate RPMTAG_SIZE. - jbj: fix: RPMTAG_SIZE is incorrect with %exclude and %ghost directives (Alexey Tourbin<[EMAIL PROTECTED]>). @@ . patch -p0 <<'@@ .' Index: rpm/build/parsePreamble.c ============================================================================ $ cvs diff -u -r2.124.2.2 -r2.124.2.3 parsePreamble.c --- rpm/build/parsePreamble.c 4 Jun 2008 22:49:40 -0000 2.124.2.2 +++ rpm/build/parsePreamble.c 18 Jun 2008 19:46:38 -0000 2.124.2.3 @@ -362,7 +362,7 @@ const char *fn, *Lurlfn = NULL; struct Source *sp; size_t nb; - char *icon = alloca(iconsize+1); + char *icon; FD_t fd = NULL; int rc = RPMERR_BADSPEC; /* assume error */ int urltype; @@ -373,6 +373,7 @@ if (iconsize < 2048) iconsize = 2048; } + icon = alloca(iconsize+1); for (sp = spec->sources; sp != NULL; sp = sp->next) { if (sp->flags & RPMFILE_ICON) @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository rpm-cvs@rpm5.org