diff options
| author | Derick Rethans <derick@php.net> | 2002-11-02 09:06:23 +0000 |
|---|---|---|
| committer | Derick Rethans <derick@php.net> | 2002-11-02 09:06:23 +0000 |
| commit | fee4ba4f135891e48c55e38d5a950044eaafdcd7 (patch) | |
| tree | 8db2ea0b247f02f1873536b1e535343830cf899e | |
| parent | e6054d28578b544dde653e2ca75a88cb1bf53929 (diff) | |
| download | php-git-fee4ba4f135891e48c55e38d5a950044eaafdcd7.tar.gz | |
- Fix segfault when __CLASS__ was used outside a class definition
| -rw-r--r-- | Zend/zend_language_scanner.l | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l index 9dce3ec396..d0b758e6de 100644 --- a/Zend/zend_language_scanner.l +++ b/Zend/zend_language_scanner.l @@ -940,7 +940,11 @@ NEWLINE ("\r"|"\n"|"\r\n") } <ST_IN_SCRIPTING>"__CLASS__" { - char *class_name = CG(active_class_entry)->name; + char *class_name = NULL; + + if (CG(active_class_entry)) { + class_name = CG(active_class_entry)->name; + } if (!class_name) { class_name = ""; |