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: 30-Jul-2007 22:24:35
Branch: HEAD Handle: 2007073021243500
Modified files:
rpm/rpmdb header.c
Log:
fix off by 8 for no magic header's. region tag now added to new magic.
Summary:
Revision Changes Path
1.55 +3 -3 rpm/rpmdb/header.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/rpmdb/header.c
============================================================================
$ cvs diff -u -r1.54 -r1.55 header.c
--- rpm/rpmdb/header.c 30 Jul 2007 19:42:59 -0000 1.54
+++ rpm/rpmdb/header.c 30 Jul 2007 20:24:35 -0000 1.55
@@ -48,7 +48,7 @@
/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/
static unsigned char meta_magic[8] = {
- 0x8e, 0xad, 0xe8, 0x3c, 0x00, 0x00, 0x00, 0x00
+ 0x8e, 0xad, 0xe8, 0x3f, 0x00, 0x00, 0x00, 0x00
};
/** \ingroup header
@@ -1453,8 +1453,8 @@
/* XXX create new magic from region marker. */
memcpy(mymagic, header_magic, sizeof(header_magic));
- if (_newmagic && length > 16+3)
- mymagic[3] = ((unsigned char *)uh)[16+3];
+ if (_newmagic && length > 8+3)
+ mymagic[3] = ((unsigned char *)uh)[8+3];
/[EMAIL PROTECTED]@*/
/[EMAIL PROTECTED]@*/
nb = Fwrite(mymagic, sizeof(char), sizeof(mymagic), fd);
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository [email protected]
