|
|
d1468a7 |
From 8067179e65a28d91f00df7d36778229a07514471 Mon Sep 17 00:00:00 2001
|
|
|
d1468a7 |
From: Jitka Plesnikova <jplesnik@redhat.com>
|
|
|
d1468a7 |
Date: Thu, 29 Apr 2021 12:21:18 +0200
|
|
|
4127699 |
Subject: [PATCH] Destroy {GDBM,NDBM,ODBM,SDBM}_File objects only from original
|
|
|
4127699 |
|
|
|
4127699 |
This patch fixes a crash when destroing a hash tied to a *_File
|
|
|
4127699 |
database after spawning a thread:
|
|
|
4127699 |
|
|
|
4127699 |
use Fcntl;
|
|
|
4127699 |
use SDBM_File;
|
|
|
4127699 |
use threads;
|
|
|
4127699 |
tie(my %dbtest, 'SDBM_File', "test.db", O_RDWR|O_CREAT, 0666);
|
|
|
4127699 |
threads->new(sub {})->join;
|
|
|
4127699 |
|
|
|
4127699 |
This crashed or paniced depending on how perl was configured.
|
|
|
4127699 |
|
|
|
4127699 |
Closes RT#61912.
|
|
|
4127699 |
|
|
|
d1468a7 |
Updated original ppisar's patch for perl 5.18.2
|
|
|
4127699 |
---
|
|
|
d1468a7 |
ext/GDBM_File/GDBM_File.xs | 20 ++++++++++++--------
|
|
|
4127699 |
ext/NDBM_File/NDBM_File.xs | 16 ++++++++++------
|
|
|
4127699 |
ext/ODBM_File/ODBM_File.xs | 18 +++++++++++-------
|
|
|
4127699 |
ext/SDBM_File/SDBM_File.xs | 4 +++-
|
|
|
4127699 |
t/lib/dbmt_common.pl | 35 +++++++++++++++++++++++++++++++++++
|
|
|
d1468a7 |
5 files changed, 71 insertions(+), 22 deletions(-)
|
|
|
4127699 |
|
|
|
4127699 |
diff --git a/ext/GDBM_File/GDBM_File.xs b/ext/GDBM_File/GDBM_File.xs
|
|
|
d1468a7 |
index cd0bb6f..0c395ac 100644
|
|
|
4127699 |
--- a/ext/GDBM_File/GDBM_File.xs
|
|
|
4127699 |
+++ b/ext/GDBM_File/GDBM_File.xs
|
|
|
4127699 |
@@ -13,6 +13,7 @@
|
|
|
4127699 |
#define store_value 3
|
|
|
4127699 |
|
|
|
4127699 |
typedef struct {
|
|
|
4127699 |
+ tTHX owner;
|
|
|
4127699 |
GDBM_FILE dbp ;
|
|
|
4127699 |
SV * filter[4];
|
|
|
4127699 |
int filtering ;
|
|
|
d1468a7 |
@@ -276,6 +277,7 @@ gdbm_TIEHASH(dbtype, name, read_write, mode)
|
|
|
70d9301 |
}
|
|
|
70d9301 |
if (dbp) {
|
|
|
70d9301 |
RETVAL = (GDBM_File)safecalloc(1, sizeof(GDBM_File_type));
|
|
|
70d9301 |
+ RETVAL->owner = aTHX;
|
|
|
70d9301 |
RETVAL->dbp = dbp;
|
|
|
70d9301 |
} else {
|
|
|
70d9301 |
RETVAL = NULL;
|
|
|
d1468a7 |
@@ -289,15 +291,17 @@ gdbm_DESTROY(db)
|
|
|
8a058d7 |
PREINIT:
|
|
|
4127699 |
int i = store_value;
|
|
|
d1468a7 |
CODE:
|
|
|
d1468a7 |
- if (gdbm_file_close(db)) {
|
|
|
d1468a7 |
- croak("gdbm_close: %s; %s", gdbm_strerror(gdbm_errno),
|
|
|
d1468a7 |
- strerror(errno));
|
|
|
d1468a7 |
+ if (db && db->owner == aTHX) {
|
|
|
d1468a7 |
+ if (gdbm_file_close(db)) {
|
|
|
d1468a7 |
+ croak("gdbm_close: %s; %s", gdbm_strerror(gdbm_errno),
|
|
|
d1468a7 |
+ strerror(errno));
|
|
|
d1468a7 |
+ }
|
|
|
d1468a7 |
+ do {
|
|
|
d1468a7 |
+ if (db->filter[i])
|
|
|
d1468a7 |
+ SvREFCNT_dec(db->filter[i]);
|
|
|
d1468a7 |
+ } while (i-- > 0);
|
|
|
d1468a7 |
+ safefree(db);
|
|
|
d1468a7 |
}
|
|
|
4127699 |
- do {
|
|
|
4127699 |
- if (db->filter[i])
|
|
|
4127699 |
- SvREFCNT_dec(db->filter[i]);
|
|
|
4127699 |
- } while (i-- > 0);
|
|
|
4127699 |
- safefree(db);
|
|
|
4127699 |
|
|
|
d1468a7 |
void
|
|
|
d1468a7 |
gdbm_UNTIE(db, count)
|
|
|
4127699 |
diff --git a/ext/NDBM_File/NDBM_File.xs b/ext/NDBM_File/NDBM_File.xs
|
|
|
d1468a7 |
index eed671a..651fe0f 100644
|
|
|
4127699 |
--- a/ext/NDBM_File/NDBM_File.xs
|
|
|
4127699 |
+++ b/ext/NDBM_File/NDBM_File.xs
|
|
|
4127699 |
@@ -33,6 +33,7 @@ END_EXTERN_C
|
|
|
4127699 |
#define store_value 3
|
|
|
4127699 |
|
|
|
4127699 |
typedef struct {
|
|
|
4127699 |
+ tTHX owner;
|
|
|
4127699 |
DBM * dbp ;
|
|
|
4127699 |
SV * filter[4];
|
|
|
4127699 |
int filtering ;
|
|
|
4127699 |
@@ -71,6 +72,7 @@ ndbm_TIEHASH(dbtype, filename, flags, mode)
|
|
|
4127699 |
RETVAL = NULL ;
|
|
|
4127699 |
if ((dbp = dbm_open(filename, flags, mode))) {
|
|
|
4127699 |
RETVAL = (NDBM_File)safecalloc(1, sizeof(NDBM_File_type));
|
|
|
4127699 |
+ RETVAL->owner = aTHX;
|
|
|
4127699 |
RETVAL->dbp = dbp ;
|
|
|
4127699 |
}
|
|
|
4127699 |
|
|
|
4127699 |
@@ -84,12 +86,14 @@ ndbm_DESTROY(db)
|
|
|
4127699 |
PREINIT:
|
|
|
4127699 |
int i = store_value;
|
|
|
4127699 |
CODE:
|
|
|
4127699 |
- dbm_close(db->dbp);
|
|
|
4127699 |
- do {
|
|
|
4127699 |
- if (db->filter[i])
|
|
|
4127699 |
- SvREFCNT_dec(db->filter[i]);
|
|
|
4127699 |
- } while (i-- > 0);
|
|
|
4127699 |
- safefree(db);
|
|
|
4127699 |
+ if (db && db->owner == aTHX) {
|
|
|
4127699 |
+ dbm_close(db->dbp);
|
|
|
4127699 |
+ do {
|
|
|
d1468a7 |
+ if (db->filter[i])
|
|
|
4127699 |
+ SvREFCNT_dec(db->filter[i]);
|
|
|
4127699 |
+ } while (i-- > 0);
|
|
|
4127699 |
+ safefree(db);
|
|
|
4127699 |
+ }
|
|
|
4127699 |
|
|
|
4127699 |
#define ndbm_FETCH(db,key) dbm_fetch(db->dbp,key)
|
|
|
4127699 |
datum_value
|
|
|
4127699 |
diff --git a/ext/ODBM_File/ODBM_File.xs b/ext/ODBM_File/ODBM_File.xs
|
|
|
d1468a7 |
index 38e6dbf..4b15a42 100644
|
|
|
4127699 |
--- a/ext/ODBM_File/ODBM_File.xs
|
|
|
4127699 |
+++ b/ext/ODBM_File/ODBM_File.xs
|
|
|
70d9301 |
@@ -49,6 +49,7 @@ datum nextkey(datum key);
|
|
|
4127699 |
#define store_value 3
|
|
|
4127699 |
|
|
|
4127699 |
typedef struct {
|
|
|
4127699 |
+ tTHX owner;
|
|
|
4127699 |
void * dbp ;
|
|
|
4127699 |
SV * filter[4];
|
|
|
4127699 |
int filtering ;
|
|
|
70d9301 |
@@ -137,6 +138,7 @@ odbm_TIEHASH(dbtype, filename, flags, mode)
|
|
|
4127699 |
}
|
|
|
4127699 |
dbp = (void*)(dbminit(filename) >= 0 ? &dbmrefcnt : 0);
|
|
|
4127699 |
RETVAL = (ODBM_File)safecalloc(1, sizeof(ODBM_File_type));
|
|
|
4127699 |
+ RETVAL->owner = aTHX;
|
|
|
4127699 |
RETVAL->dbp = dbp ;
|
|
|
4127699 |
}
|
|
|
4127699 |
OUTPUT:
|
|
|
70d9301 |
@@ -149,13 +151,15 @@ DESTROY(db)
|
|
|
4127699 |
dMY_CXT;
|
|
|
4127699 |
int i = store_value;
|
|
|
4127699 |
CODE:
|
|
|
4127699 |
- dbmrefcnt--;
|
|
|
4127699 |
- dbmclose();
|
|
|
4127699 |
- do {
|
|
|
4127699 |
- if (db->filter[i])
|
|
|
4127699 |
- SvREFCNT_dec(db->filter[i]);
|
|
|
4127699 |
- } while (i-- > 0);
|
|
|
4127699 |
- safefree(db);
|
|
|
4127699 |
+ if (db && db->owner == aTHX) {
|
|
|
4127699 |
+ dbmrefcnt--;
|
|
|
4127699 |
+ dbmclose();
|
|
|
4127699 |
+ do {
|
|
|
d1468a7 |
+ if (db->filter[i])
|
|
|
4127699 |
+ SvREFCNT_dec(db->filter[i]);
|
|
|
4127699 |
+ } while (i-- > 0);
|
|
|
4127699 |
+ safefree(db);
|
|
|
4127699 |
+ }
|
|
|
4127699 |
|
|
|
4127699 |
datum_value
|
|
|
4127699 |
odbm_FETCH(db, key)
|
|
|
4127699 |
diff --git a/ext/SDBM_File/SDBM_File.xs b/ext/SDBM_File/SDBM_File.xs
|
|
|
d1468a7 |
index 0df2855..0e2bd58 100644
|
|
|
4127699 |
--- a/ext/SDBM_File/SDBM_File.xs
|
|
|
4127699 |
+++ b/ext/SDBM_File/SDBM_File.xs
|
|
|
4127699 |
@@ -10,6 +10,7 @@
|
|
|
4127699 |
#define store_value 3
|
|
|
4127699 |
|
|
|
4127699 |
typedef struct {
|
|
|
4127699 |
+ tTHX owner;
|
|
|
4127699 |
DBM * dbp ;
|
|
|
4127699 |
SV * filter[4];
|
|
|
4127699 |
int filtering ;
|
|
|
d1468a7 |
@@ -51,6 +52,7 @@ sdbm_TIEHASH(dbtype, filename, flags, mode, pagname=NULL)
|
|
|
7c8317a |
}
|
|
|
7c8317a |
if (dbp) {
|
|
|
4127699 |
RETVAL = (SDBM_File)safecalloc(1, sizeof(SDBM_File_type));
|
|
|
4127699 |
+ RETVAL->owner = aTHX;
|
|
|
4127699 |
RETVAL->dbp = dbp ;
|
|
|
4127699 |
}
|
|
|
4127699 |
|
|
|
70d9301 |
@@ -62,7 +64,7 @@ void
|
|
|
4127699 |
sdbm_DESTROY(db)
|
|
|
4127699 |
SDBM_File db
|
|
|
4127699 |
CODE:
|
|
|
4127699 |
- if (db) {
|
|
|
4127699 |
+ if (db && db->owner == aTHX) {
|
|
|
4127699 |
int i = store_value;
|
|
|
4127699 |
sdbm_close(db->dbp);
|
|
|
4127699 |
do {
|
|
|
4127699 |
diff --git a/t/lib/dbmt_common.pl b/t/lib/dbmt_common.pl
|
|
|
d1468a7 |
index 60c66ae..a7f81fe 100644
|
|
|
4127699 |
--- a/t/lib/dbmt_common.pl
|
|
|
4127699 |
+++ b/t/lib/dbmt_common.pl
|
|
|
70d9301 |
@@ -510,5 +510,40 @@ unlink <Op_dbmx*>, $Dfile;
|
|
|
4127699 |
unlink <Op1_dbmx*>;
|
|
|
4127699 |
}
|
|
|
4127699 |
|
|
|
4127699 |
+{
|
|
|
4127699 |
+ # Check DBM back-ends do not destroy objects from then-spawned threads.
|
|
|
4127699 |
+ # RT#61912.
|
|
|
4127699 |
+ SKIP: {
|
|
|
4127699 |
+ my $threads_count = 2;
|
|
|
4127699 |
+ skip 'Threads are disabled', 3 + 2 * $threads_count
|
|
|
4127699 |
+ unless $Config{usethreads};
|
|
|
4127699 |
+ use_ok('threads');
|
|
|
4127699 |
+
|
|
|
4127699 |
+ my %h;
|
|
|
4127699 |
+ unlink <Op1_dbmx*>;
|
|
|
4127699 |
+
|
|
|
4127699 |
+ my $db = tie %h, $DBM_Class, 'Op1_dbmx', $create, 0640;
|
|
|
4127699 |
+ isa_ok($db, $DBM_Class);
|
|
|
4127699 |
+
|
|
|
4127699 |
+ for (1 .. 2) {
|
|
|
4127699 |
+ ok(threads->create(
|
|
|
4127699 |
+ sub {
|
|
|
4127699 |
+ $SIG{'__WARN__'} = sub { fail(shift) }; # debugging perl panics
|
|
|
4127699 |
+ # report it by spurious TAP line
|
|
|
4127699 |
+ 1;
|
|
|
4127699 |
+ }), "Thread $_ created");
|
|
|
4127699 |
+ }
|
|
|
4127699 |
+ for (threads->list) {
|
|
|
4127699 |
+ is($_->join, 1, "A thread exited successfully");
|
|
|
4127699 |
+ }
|
|
|
4127699 |
+
|
|
|
4127699 |
+ pass("Tied object survived exiting threads");
|
|
|
4127699 |
+
|
|
|
4127699 |
+ undef $db;
|
|
|
4127699 |
+ untie %h;
|
|
|
4127699 |
+ unlink <Op1_dbmx*>;
|
|
|
4127699 |
+ }
|
|
|
4127699 |
+}
|
|
|
4127699 |
+
|
|
|
4127699 |
done_testing();
|
|
|
4127699 |
1;
|
|
|
4127699 |
--
|
|
|
d1468a7 |
2.26.3
|
|
|
4127699 |
|