RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: rpm Date: 08-Aug-2013 17:38:34
Branch: rpm-5_4 Handle: 2013080815383301
Modified files: (Branch: rpm-5_4)
rpm CHANGES
rpm/tools debugedit.c
Log:
debugedit.c: fix #rhbz929365
Summary:
Revision Changes Path
1.3501.2.336+1 -0 rpm/CHANGES
2.23.2.9 +4 -1 rpm/tools/debugedit.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3501.2.335 -r1.3501.2.336 CHANGES
--- rpm/CHANGES 8 Aug 2013 13:55:15 -0000 1.3501.2.335
+++ rpm/CHANGES 8 Aug 2013 15:38:33 -0000 1.3501.2.336
@@ -1,4 +1,5 @@
5.4.12 -> 5.4.13:
+ - devzero2000: debugedit.c: fix #rhbz929365
- devzero2000: debugedit.c: fix #opensusebz 818502
- devzero2000: add a simple lua test for testing the fix added in commit
"permit empty-body no-operation for embedded interpreter macro
@@ .
patch -p0 <<'@@ .'
Index: rpm/tools/debugedit.c
============================================================================
$ cvs diff -u -r2.23.2.8 -r2.23.2.9 debugedit.c
--- rpm/tools/debugedit.c 8 Aug 2013 13:55:16 -0000 2.23.2.8
+++ rpm/tools/debugedit.c 8 Aug 2013 15:38:34 -0000 2.23.2.9
@@ -501,6 +501,9 @@
edit_dwarf2_line (DSO *dso, rpmuint32_t off, char *comp_dir, int phase)
{
unsigned char *ptr = debug_sections[DEBUG_LINE].data, *dir;
+ /* XXX: Fix rhbz#929365, perhaps it is better to emit an error ? */
+ if (ptr == NULL)
+ return 0;
unsigned char **dirt;
unsigned char *endsec = ptr + debug_sections[DEBUG_LINE].size;
unsigned char *endcu, *endprol;
@@ -511,7 +514,7 @@
if (phase != 0)
return 0;
-
+
ptr += off;
endcu = ptr + 4;
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
