Don't index NULL pointer when fetching non-existent constant

diff --git a/Zend/zend_constants.c b/Zend/zend_constants.c
index 0885525676bff5f9c340902978b2c72b4522528a..958bd36d1dab5f40b7d4070546e9ac60a995c25a 100644 (file)
--- a/Zend/zend_constants.c
+++ b/Zend/zend_constants.c
@@ -454,12 +454,15 @@ failure:
                }
        }
 
-       if (!(flags & ZEND_FETCH_CLASS_SILENT)) {
-               if (!c) {
+       if (!c) {
+               if (!(flags & ZEND_FETCH_CLASS_SILENT)) {
                        zend_throw_error(NULL, "Undefined constant '%s'", name);
-               } else if (ZEND_CONSTANT_FLAGS(c) & CONST_DEPRECATED) {
-                       zend_error(E_DEPRECATED, "Constant %s is deprecated", name);
                }
+               return NULL;
+       }
+
+       if (!(flags & ZEND_FETCH_CLASS_SILENT) && (ZEND_CONSTANT_FLAGS(c) & CONST_DEPRECATED)) {
+               zend_error(E_DEPRECATED, "Constant %s is deprecated", name);
        }
        return &c->value;
 }