Unify and make it easy to add code into the broken-string error handler

diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index e19cc57cd82c7949c84ec71add4018e5173c442a..5b304363881fc82bdede1d089bd06f511186b9ff 100644 (file)
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -250,9 +250,9 @@ ZEND_API ZEND_FUNCTION(display_disabled_function);
 
 #if ZEND_DEBUG
 #define CHECK_ZVAL_STRING(z) \
-       if ((z)->value.str.val[ (z)->value.str.len ] != '\0') zend_error(E_WARNING, "String is not zero-terminated (%s)", (z)->value.str.val);
+       if ((z)->value.str.val[ (z)->value.str.len ] != '\0') { zend_error(E_WARNING, "String is not zero-terminated (%s)", (z)->value.str.val); }
 #define CHECK_ZVAL_STRING_REL(z) \
-       if ((z)->value.str.val[ (z)->value.str.len ] != '\0') zend_error(E_WARNING, "String is not zero-terminated (%s) (source: %s:%d)", (z)->value.str.val ZEND_FILE_LINE_RELAY_CC);
+       if ((z)->value.str.val[ (z)->value.str.len ] != '\0') { zend_error(E_WARNING, "String is not zero-terminated (%s) (source: %s:%d)", (z)->value.str.val ZEND_FILE_LINE_RELAY_CC); }
 #else
 #define CHECK_ZVAL_STRING(z)
 #define CHECK_ZVAL_STRING_REL(z)