Google Groups no longer supports new Usenet posts or subscriptions. Historical content remains viewable.
Dismiss
[svn:dbi] r15592 - dbi/trunk
3 views
Skip to first unread message
ti...@cvs.perl.org
Mar 28, 2013, 9:14:41 AM3/28/13
to svn-commit-...@perl.org
Author: timbo
Date: Thu Mar 28 06:14:41 2013
New Revision: 15592
Modified:
dbi/trunk/DBI.xs
Log:
Oops. Missed a bit for the heap-use-after-free fix RT#75614
Modified: dbi/trunk/DBI.xs
==============================================================================
--- dbi/trunk/DBI.xs (original)
+++ dbi/trunk/DBI.xs Thu Mar 28 06:14:41 2013
@@ -3463,9 +3463,13 @@
/* XXX sv_copy() if Profiling? */
(void)hv_store((HV*)SvRV(parent), "Statement", 9, SvREFCNT_inc(tmp_sv), 0);
}
- is_nested_call = (!PL_dirty && (DBIc_PARENT_COM(imp_xxh) && (DBIc_CALL_DEPTH(DBIc_PARENT_COM(imp_xxh)) >= 1)) );
- }
+ is_nested_call =
+ (call_depth > 1
+ || (!PL_dirty /* not in global destruction [CPAN #75614] */
+ && DBIc_PARENT_COM(imp_xxh)
+ && DBIc_CALL_DEPTH(DBIc_PARENT_COM(imp_xxh))) >= 1);
+ }
/* --- dispatch --- */
Date: Thu Mar 28 06:14:41 2013
New Revision: 15592
Modified:
dbi/trunk/DBI.xs
Log:
Oops. Missed a bit for the heap-use-after-free fix RT#75614
Modified: dbi/trunk/DBI.xs
==============================================================================
--- dbi/trunk/DBI.xs (original)
+++ dbi/trunk/DBI.xs Thu Mar 28 06:14:41 2013
@@ -3463,9 +3463,13 @@
/* XXX sv_copy() if Profiling? */
(void)hv_store((HV*)SvRV(parent), "Statement", 9, SvREFCNT_inc(tmp_sv), 0);
}
- is_nested_call = (!PL_dirty && (DBIc_PARENT_COM(imp_xxh) && (DBIc_CALL_DEPTH(DBIc_PARENT_COM(imp_xxh)) >= 1)) );
- }
+ is_nested_call =
+ (call_depth > 1
+ || (!PL_dirty /* not in global destruction [CPAN #75614] */
+ && DBIc_PARENT_COM(imp_xxh)
+ && DBIc_CALL_DEPTH(DBIc_PARENT_COM(imp_xxh))) >= 1);
+ }
/* --- dispatch --- */
0 new messages