diff options
| author | mandree <mandree@FreeBSD.org> | 2016-11-10 06:31:48 +0800 |
|---|---|---|
| committer | mandree <mandree@FreeBSD.org> | 2016-11-10 06:31:48 +0800 |
| commit | df76fdf9a23e9d3c0456e7e520c8d6b3da473523 (patch) | |
| tree | 15eebdc5c618c4abdc4ee31c1acec4c871bd0890 /databases/db5 | |
| parent | b8b57cb45a8cc93a81813df06201d235a3725d3e (diff) | |
| download | freebsd-ports-gnome-df76fdf9a23e9d3c0456e7e520c8d6b3da473523.tar.gz freebsd-ports-gnome-df76fdf9a23e9d3c0456e7e520c8d6b3da473523.tar.zst freebsd-ports-gnome-df76fdf9a23e9d3c0456e7e520c8d6b3da473523.zip | |
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
Diffstat (limited to 'databases/db5')
| -rw-r--r-- | databases/db5/Makefile | 2 | ||||
| -rw-r--r-- | databases/db5/files/patch-lang_tcl_tcl__env.c | 2 | ||||
| -rw-r--r-- | databases/db5/files/patch-lang_tcl_tcl__seq.c | 2 | ||||
| -rw-r--r-- | databases/db5/files/patch-src_heap_heap__verify.c | 11 |
4 files changed, 14 insertions, 3 deletions
diff --git a/databases/db5/Makefile b/databases/db5/Makefile index 7098938a6289..57e78326e8b3 100644 --- a/databases/db5/Makefile +++ b/databases/db5/Makefile @@ -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?= diff --git a/databases/db5/files/patch-lang_tcl_tcl__env.c b/databases/db5/files/patch-lang_tcl_tcl__env.c index b923a521c0cf..ce814065f586 100644 --- a/databases/db5/files/patch-lang_tcl_tcl__env.c +++ b/databases/db5/files/patch-lang_tcl_tcl__env.c @@ -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++) diff --git a/databases/db5/files/patch-lang_tcl_tcl__seq.c b/databases/db5/files/patch-lang_tcl_tcl__seq.c index 14bb378b718a..35ef6723e076 100644 --- a/databases/db5/files/patch-lang_tcl_tcl__seq.c +++ b/databases/db5/files/patch-lang_tcl_tcl__seq.c @@ -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++) diff --git a/databases/db5/files/patch-src_heap_heap__verify.c b/databases/db5/files/patch-src_heap_heap__verify.c new file mode 100644 index 000000000000..c31387280ddc --- /dev/null +++ b/databases/db5/files/patch-src_heap_heap__verify.c @@ -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; |