From 040a6474815c22eecd4cc86dbdc96931ce408bf0 Mon Sep 17 00:00:00 2001
From: Felipe Pena <felipe@php.net>
Date: Wed, 13 May 2009 02:16:36 +0000
Subject: [PATCH] - MFH: Fixed bug #48240 (DBA Segmentation fault dba_nextkey)

---
 NEWS                        |  1 +
 ext/dba/dba_db4.c           |  2 +-
 ext/dba/tests/bug48240.phpt | 25 +++++++++++++++++++++++++
 3 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 ext/dba/tests/bug48240.phpt

diff --git a/NEWS b/NEWS
index 296fd44fa7..f9ef5b314e 100644
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,7 @@ PHP                                                                        NEWS
 
 - Fixed bug #48248 (SIGSEGV when access to private property via &__get). 
   (Felipe)
+- Fixed bug #48240 (DBA Segmentation fault dba_nextkey). (Felipe)
 - Fixed bug #48224 (Incorrect shuffle in array_rand). (Etienne)
 - Fixed bug #48221 (memory leak when passing invalid xslt parameter). (Felipe)
 - Fixed bug #48206 (Iterating over an invalid data structure
diff --git a/ext/dba/dba_db4.c b/ext/dba/dba_db4.c
index 8e14339711..bcec74a01b 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===
-- 
2.50.1