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:44:47
Branch: rpm-5_0 Handle: 2008061819444601
Modified files: (Branch: rpm-5_0)
rpm CHANGES
rpm/build parsePreamble.c
Log:
- fix: allocate Icon: buffer after iconsize is initialized.
Summary:
Revision Changes Path
1.2054.2.95 +1 -0 rpm/CHANGES
2.167.2.3 +3 -2 rpm/build/parsePreamble.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2054.2.94 -r1.2054.2.95 CHANGES
--- rpm/CHANGES 18 Jun 2008 16:49:26 -0000 1.2054.2.94
+++ rpm/CHANGES 18 Jun 2008 19:44:46 -0000 1.2054.2.95
@@ -1,4 +1,5 @@
5.0.3 -> 5.0.4:
+ - jbj: fix: allocate Icon: buffer after iconsize is initialized.
- jbj: permit configurable POSIX behavior for parameterized macros
(Marcin Kowalczyk<[EMAIL PROTECTED]>).
- jbj: fix: skip %exclude/%ghost files to get more accurate RPMTAG_SIZE.
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/parsePreamble.c
============================================================================
$ cvs diff -u -r2.167.2.2 -r2.167.2.3 parsePreamble.c
--- rpm/build/parsePreamble.c 8 Jun 2008 16:01:20 -0000 2.167.2.2
+++ rpm/build/parsePreamble.c 18 Jun 2008 19:44:47 -0000 2.167.2.3
@@ -410,7 +410,7 @@
const char *fn, *Lurlfn = NULL;
struct Source *sp;
size_t nb;
- uint8_t * icon = alloca(iconsize+1);
+ uint8_t * icon;
FD_t fd = NULL;
int rc = RPMRC_FAIL; /* assume error */
int urltype;
@@ -421,6 +421,7 @@
if (iconsize < 2048)
iconsize = 2048;
}
+ icon = alloca(iconsize+1);
for (sp = spec->sources; sp != NULL; sp = sp->next) {
if (sp->flags & RPMFILE_ICON)
@@ -460,7 +461,7 @@
/[EMAIL PROTECTED]@*/ break;
}
- fd = Fopen(fn, "r.fdio");
+ fd = Fopen(fn, "r%{?_rpmgio}");
if (fd == NULL || Ferror(fd)) {
rpmlog(RPMLOG_ERR, _("Unable to open icon %s: %s\n"),
fn, Fstrerror(fd));
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
