From: Felipe Pena <felipe@php.net>
Date: Wed, 13 May 2009 02:14:18 +0000 (+0000)
Subject: - Fixed bug #48240 (DBA Segmentation fault dba_nextkey)
X-Git-Tag: php-5.4.0alpha1~191^2~3677
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=efc82a96da53660e4729cb972af14b74a3b5a71b;p=php

- Fixed bug #48240 (DBA Segmentation fault dba_nextkey)
---

diff --git a/ext/dba/dba_db4.c b/ext/dba/dba_db4.c
index 5cbdd64906..df20ac7d1e 100644
--- a/ext/dba/dba_db4.c
+++ b/ext/dba/dba_db4.c
@@ -219,7 +219,7 @@ DBA_NEXTKEY_FUNC(db4)
 		gkey.flags |= DB_DBT_MALLOC;
 		gval.flags |= DB_DBT_MALLOC;
 	}
-	if (dba->cursor->c_get(dba->cursor, &gkey, &gval, DB_NEXT) == 0) {
+	if (dba->cursor && dba->cursor->c_get(dba->cursor, &gkey, &gval, DB_NEXT) == 0) {
 		if (gkey.data) {
 			nkey = estrndup(gkey.data, gkey.size);
 			if (newlen) *newlen = gkey.size;
diff --git a/ext/dba/tests/bug48240.phpt b/ext/dba/tests/bug48240.phpt
new file mode 100644
index 0000000000..72dc439564
--- /dev/null
+++ b/ext/dba/tests/bug48240.phpt
@@ -0,0 +1,25 @@
+--TEST--
+Bug #48240 (DBA Segmentation fault dba_nextkey)
+--SKIPIF--
+<?php 
+	$handler = 'db4';
+	require_once('skipif.inc');
+?>
+--FILE--
+<?php
+
+$handler = 'db4';
+require_once('test.inc');
+
+$db = dba_open($db_filename, 'c', 'db4');
+
+var_dump(dba_nextkey($db));
+
+dba_close($db);
+unlink($db_filename);
+
+?>
+===DONE===
+--EXPECT--
+bool(false)
+===DONE===