From: Rafael Garcia-Suarez <rgarciasuarez@gmail.com>
Date: Wed, 24 May 2006 13:34:45 +0000 (+0000)
Subject: Fix segfault in SDBM_File when the destructor is called multiple times
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=8a0b16eb60065835f8d356f329e2b8cbfe8c9d62;p=p5sagit%2Fp5-mst-13.2.git

Fix segfault in SDBM_File when the destructor is called multiple times

p4raw-id: //depot/perl@28298
---

diff --git a/ext/SDBM_File/SDBM_File.pm b/ext/SDBM_File/SDBM_File.pm
index 07a05e1..d1209e0 100644
--- a/ext/SDBM_File/SDBM_File.pm
+++ b/ext/SDBM_File/SDBM_File.pm
@@ -7,7 +7,7 @@ require Tie::Hash;
 use XSLoader ();
 
 our @ISA = qw(Tie::Hash);
-our $VERSION = "1.05";
+our $VERSION = "1.06";
 
 XSLoader::load 'SDBM_File', $VERSION;
 
diff --git a/ext/SDBM_File/SDBM_File.xs b/ext/SDBM_File/SDBM_File.xs
index 24b2b83..6aafb6b 100644
--- a/ext/SDBM_File/SDBM_File.xs
+++ b/ext/SDBM_File/SDBM_File.xs
@@ -53,16 +53,18 @@ void
 sdbm_DESTROY(db)
 	SDBM_File	db
 	CODE:
-	  sdbm_close(db->dbp);
-	  if (db->filter_fetch_key)
-	    SvREFCNT_dec(db->filter_fetch_key) ;
-	  if (db->filter_store_key)
-	    SvREFCNT_dec(db->filter_store_key) ;
-	  if (db->filter_fetch_value)
-	    SvREFCNT_dec(db->filter_fetch_value) ;
-	  if (db->filter_store_value)
-	    SvREFCNT_dec(db->filter_store_value) ;
-	  safefree(db) ;
+	if (db) {
+	    sdbm_close(db->dbp);
+	    if (db->filter_fetch_key)
+		SvREFCNT_dec(db->filter_fetch_key) ;
+	    if (db->filter_store_key)
+		SvREFCNT_dec(db->filter_store_key) ;
+	    if (db->filter_fetch_value)
+		SvREFCNT_dec(db->filter_fetch_value) ;
+	    if (db->filter_store_value)
+		SvREFCNT_dec(db->filter_store_value) ;
+	    safefree(db) ;
+	}
 
 datum_value
 sdbm_FETCH(db, key)