svn commit: r425813 - in head/databases/db5: . files
Matthias Andree
mandree at FreeBSD.org
Wed Nov 9 22:31:50 UTC 2016
Author: mandree
Date: Wed Nov 9 22:31:48 2016
New Revision: 425813
URL: https://svnweb.freebsd.org/changeset/ports/425813
Log:
Avoid junk pointer when __db_vrfy_datapage() fails
Rather than second-guessing what the __os_free() might be doing and
avoiding it, initialize the pointer to NULL, which __os_free() will
skip. This should be the safer approach if Oracle ever patches other
parts of db 5.3.
PR: 210829
Submitted by: Mark Millard
Added:
head/databases/db5/files/patch-src_heap_heap__verify.c (contents, props changed)
Modified:
head/databases/db5/Makefile
head/databases/db5/files/patch-lang_tcl_tcl__env.c
head/databases/db5/files/patch-lang_tcl_tcl__seq.c
Modified: head/databases/db5/Makefile
==============================================================================
--- head/databases/db5/Makefile Wed Nov 9 22:06:42 2016 (r425812)
+++ head/databases/db5/Makefile Wed Nov 9 22:31:48 2016 (r425813)
@@ -3,7 +3,7 @@
PORTNAME= db5
PORTVERSION= 5.3.28
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= databases java
MASTER_SITES= http://download.oracle.com/berkeley-db/
PKGNAMEPREFIX?=
Modified: head/databases/db5/files/patch-lang_tcl_tcl__env.c
==============================================================================
--- head/databases/db5/files/patch-lang_tcl_tcl__env.c Wed Nov 9 22:06:42 2016 (r425812)
+++ head/databases/db5/files/patch-lang_tcl_tcl__env.c Wed Nov 9 22:31:48 2016 (r425813)
@@ -1,4 +1,4 @@
---- lang/tcl/tcl_env.c.orig 2016-05-24 08:19:08 UTC
+--- lang/tcl/tcl_env.c.orig 2013-09-09 15:35:07 UTC
+++ lang/tcl/tcl_env.c
@@ -2864,9 +2864,10 @@ env_GetFlags(interp, objc, objv, dbenv)
for (i = 0; open_flags[i].flag != 0; i++)
Modified: head/databases/db5/files/patch-lang_tcl_tcl__seq.c
==============================================================================
--- head/databases/db5/files/patch-lang_tcl_tcl__seq.c Wed Nov 9 22:06:42 2016 (r425812)
+++ head/databases/db5/files/patch-lang_tcl_tcl__seq.c Wed Nov 9 22:31:48 2016 (r425813)
@@ -1,4 +1,4 @@
---- lang/tcl/tcl_seq.c.orig 2016-05-24 08:18:03 UTC
+--- lang/tcl/tcl_seq.c.orig 2013-09-09 15:35:07 UTC
+++ lang/tcl/tcl_seq.c
@@ -555,9 +555,10 @@ tcl_SeqGetFlags(interp, objc, objv, seq)
for (i = 0; seq_flags[i].flag != 0; i++)
Added: head/databases/db5/files/patch-src_heap_heap__verify.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/db5/files/patch-src_heap_heap__verify.c Wed Nov 9 22:31:48 2016 (r425813)
@@ -0,0 +1,11 @@
+--- src/heap/heap_verify.c.orig 2013-09-09 15:35:08 UTC
++++ src/heap/heap_verify.c
+@@ -122,7 +122,7 @@ __heap_vrfy(dbp, vdp, h, pgno, flags)
+ {
+ HEAPHDR *hdr;
+ int cnt, i, j, ret;
+- db_indx_t *offsets, *offtbl, end;
++ db_indx_t *offsets = NULL, *offtbl, end;
+
+ if ((ret = __db_vrfy_datapage(dbp, vdp, h, pgno, flags)) != 0)
+ goto err;
More information about the svn-ports-all
mailing list