Skip to content

Commit 9579c43

Browse files
committed
ensure namespaces are not used after free
1 parent 0ccd215 commit 9579c43

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

Zend/zend.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1226,13 +1226,13 @@ void zend_shutdown(void) /* {{{ */
12261226
zend_map_ptr_static_last = 0;
12271227
zend_map_ptr_static_size = 0;
12281228

1229-
zend_destroy_namespaces();
1230-
12311229
zend_destroy_rsrc_list_dtors();
12321230

12331231
zend_unload_modules();
12341232

12351233
zend_optimizer_shutdown();
1234+
1235+
zend_destroy_namespaces();
12361236
startup_done = false;
12371237
}
12381238
/* }}} */

Zend/zend_namespaces.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,4 +119,5 @@ void zend_destroy_namespaces(void) {
119119
}
120120

121121
zend_hash_destroy(&namespaces);
122+
global_namespace = NULL;
122123
}

0 commit comments

Comments
 (0)