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: 08-Dec-2007 19:09:32
Branch: HEAD Handle: 2007120818093101
Modified files:
rpm CHANGES
rpm/rpmdb header.c header_internal.h
Log:
- jbj: relax the current header sanity checks, permit 1Gb headers.
Summary:
Revision Changes Path
1.1961 +1 -0 rpm/CHANGES
1.141 +1 -1 rpm/rpmdb/header.c
1.38 +3 -3 rpm/rpmdb/header_internal.h
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.1960 -r1.1961 CHANGES
--- rpm/CHANGES 8 Dec 2007 16:30:49 -0000 1.1960
+++ rpm/CHANGES 8 Dec 2007 18:09:31 -0000 1.1961
@@ -1,4 +1,5 @@
5.0a4 -> 5.0b1:
+ - jbj: relax the current header sanity checks, permit 1Gb headers.
- jbj: refactor some final \n out of msgs into rpmlog format instead.
- jbj: add global pgpDigVSFlags, nuke unused pgpDig{Get,Set}VSFlags.
- jbj: punt on minor issues for beta1.
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/header.c
============================================================================
$ cvs diff -u -r1.140 -r1.141 header.c
--- rpm/rpmdb/header.c 27 Nov 2007 02:29:27 -0000 1.140
+++ rpm/rpmdb/header.c 8 Dec 2007 18:09:32 -0000 1.141
@@ -82,7 +82,7 @@
* Maximum no. of bytes permitted in a header.
*/
/[EMAIL PROTECTED]@*/
-static size_t headerMaxbytes = (32*1024*1024);
+static size_t headerMaxbytes = (1024*1024*1024);
/**
* Global header stats enabler.
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/header_internal.h
============================================================================
$ cvs diff -u -r1.37 -r1.38 header_internal.h
--- rpm/rpmdb/header_internal.h 26 Nov 2007 05:16:52 -0000 1.37
+++ rpm/rpmdb/header_internal.h 8 Dec 2007 18:09:32 -0000 1.38
@@ -15,7 +15,7 @@
* Sanity check on no. of tags.
* This check imposes a limit of 65K tags, more than enough.
*/
-#define hdrchkTags(_ntags) ((_ntags) & 0xffff0000)
+#define hdrchkTags(_ntags) ((_ntags) & 0xff000000)
/**
* Sanity check on type values.
@@ -24,9 +24,9 @@
/**
* Sanity check on data size and/or offset and/or count.
- * This check imposes a limit of 16 MB, more than enough.
+ * This check imposes a limit of 1 Gb.
*/
-#define hdrchkData(_nbytes) ((_nbytes) & 0xff000000)
+#define hdrchkData(_nbytes) ((_nbytes) & 0x80000000)
/**
* Sanity check on data alignment for data type.
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
