Provide more macros for handling of interned strings

 * str_erealloc behaves like erealloc for normal strings, but will
   use emalloc+memcpy for interned strings.
 * str_estrndup behaves like estrndup for normal strings, but will
   not copy interned strings.
 * str_strndup behaves like zend_strndup for normal strings, but
   will not copy interned strings.
 * str_efree_rel behaves like efree_rel for normal strings, but
   will not free interned strings.
 * str_hash will return INTERNED_HASH for interned strings and
   compute it using zend_hash_func for normal strings.

1 files changed, 15 insertions, 29 deletions

diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
index 34237387b6..e8629291e5 100644
--- a/Zend/zend_operators.c
+++ b/Zend/zend_operators.c
@@ -192,7 +192,7 @@ ZEND_API void convert_scalar_to_number(zval *op TSRMLS_DC) /* {{{ */
 				if ((Z_TYPE_P(op)=is_numeric_string(strval, Z_STRLEN_P(op), &Z_LVAL_P(op), &Z_DVAL_P(op), 1)) == 0) {
 					ZVAL_LONG(op, 0);
 				}
-				STR_FREE(strval);
+				str_efree(strval);
 				break;
 			}
 		case IS_BOOL:
@@ -391,7 +391,7 @@ ZEND_API void convert_to_long_base(zval *op, int base) /* {{{ */
 				char *strval = Z_STRVAL_P(op);
 
 				Z_LVAL_P(op) = strtol(strval, NULL, base);
-				STR_FREE(strval);
+				str_efree(strval);
 			}
 			break;
 		case IS_ARRAY:
@@ -451,7 +451,7 @@ ZEND_API void convert_to_double(zval *op) /* {{{ */
 				char *strval = Z_STRVAL_P(op);
 
 				Z_DVAL_P(op) = zend_strtod(strval, NULL);
-				STR_FREE(strval);
+				str_efree(strval);
 			}
 			break;
 		case IS_ARRAY:
@@ -540,7 +540,7 @@ ZEND_API void convert_to_boolean(zval *op) /* {{{ */
 				} else {
 					Z_LVAL_P(op) = 1;
 				}
-				STR_FREE(strval);
+				str_efree(strval);
 			}
 			break;
 		case IS_ARRAY:
@@ -1153,7 +1153,7 @@ ZEND_API int bitwise_or_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) /
 			result_str[i] |= Z_STRVAL_P(shorter)[i];
 		}
 		if (result==op1) {
-			STR_FREE(Z_STRVAL_P(result));
+			str_efree(Z_STRVAL_P(result));
 		}
 		Z_STRVAL_P(result) = result_str;
 		Z_STRLEN_P(result) = result_len;
@@ -1200,7 +1200,7 @@ ZEND_API int bitwise_and_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
 			result_str[i] &= Z_STRVAL_P(longer)[i];
 		}
 		if (result==op1) {
-			STR_FREE(Z_STRVAL_P(result));
+			str_efree(Z_STRVAL_P(result));
 		}
 		Z_STRVAL_P(result) = result_str;
 		Z_STRLEN_P(result) = result_len;
@@ -1247,7 +1247,7 @@ ZEND_API int bitwise_xor_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
 			result_str[i] ^= Z_STRVAL_P(longer)[i];
 		}
 		if (result==op1) {
-			STR_FREE(Z_STRVAL_P(result));
+			str_efree(Z_STRVAL_P(result));
 		}
 		Z_STRVAL_P(result) = result_str;
 		Z_STRLEN_P(result) = result_len;
@@ -1313,14 +1313,8 @@ ZEND_API int shift_right_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
 ZEND_API int add_char_to_string(zval *result, const zval *op1, const zval *op2) /* {{{ */
 {
 	int length = Z_STRLEN_P(op1) + 1;
-	char *buf;
+	char *buf = str_erealloc(Z_STRVAL_P(op1), length + 1);
 
-	if (IS_INTERNED(Z_STRVAL_P(op1))) {
-		buf = (char *) emalloc(length + 1);
-		memcpy(buf, Z_STRVAL_P(op1), Z_STRLEN_P(op1));
-	} else {
-		buf = (char *) erealloc(Z_STRVAL_P(op1), length + 1);
-	}
 	buf[length - 1] = (char) Z_LVAL_P(op2);
 	buf[length] = 0;
 	ZVAL_STRINGL(result, buf, length, 0);
@@ -1332,14 +1326,8 @@ ZEND_API int add_char_to_string(zval *result, const zval *op1, const zval *op2)
 ZEND_API int add_string_to_string(zval *result, const zval *op1, const zval *op2) /* {{{ */
 {
 	int length = Z_STRLEN_P(op1) + Z_STRLEN_P(op2);
-	char *buf;
+	char *buf = str_erealloc(Z_STRVAL_P(op1), length + 1);
 
-	if (IS_INTERNED(Z_STRVAL_P(op1))) {
-		buf = (char *) emalloc(length+1);
-		memcpy(buf, Z_STRVAL_P(op1), Z_STRLEN_P(op1));
-	} else {
-		buf = (char *) erealloc(Z_STRVAL_P(op1), length+1);
-	}
 	memcpy(buf + Z_STRLEN_P(op1), Z_STRVAL_P(op2), Z_STRLEN_P(op2));
 	buf[length] = 0;
 	ZVAL_STRINGL(result, buf, length, 0);
@@ -1842,16 +1830,14 @@ static void increment_string(zval *str) /* {{{ */
 	int ch;
 
 	if (Z_STRLEN_P(str) == 0) {
-		STR_FREE(Z_STRVAL_P(str));
+		str_efree(Z_STRVAL_P(str));
 		Z_STRVAL_P(str) = estrndup("1", sizeof("1")-1);
 		Z_STRLEN_P(str) = 1;
 		return;
 	}
 
 	if (IS_INTERNED(s)) {
-		s = (char*) emalloc(Z_STRLEN_P(str) + 1);
-		memcpy(s, Z_STRVAL_P(str), Z_STRLEN_P(str) + 1);
-		Z_STRVAL_P(str) = s;
+		Z_STRVAL_P(str) = s = estrndup(s, Z_STRLEN_P(str));
 	}
 
 	while (pos >= 0) {
@@ -1909,7 +1895,7 @@ static void increment_string(zval *str) /* {{{ */
 				t[0] = 'a';
 				break;
 		}
-		STR_FREE(Z_STRVAL_P(str));
+		str_efree(Z_STRVAL_P(str));
 		Z_STRVAL_P(str) = t;
 	}
 }
@@ -1999,13 +1985,13 @@ ZEND_API int decrement_function(zval *op1) /* {{{ */
 			break;
 		case IS_STRING:		/* Like perl we only support string increment */
 			if (Z_STRLEN_P(op1) == 0) { /* consider as 0 */
-				STR_FREE(Z_STRVAL_P(op1));
+				str_efree(Z_STRVAL_P(op1));
 				ZVAL_LONG(op1, -1);
 				break;
 			}
 			switch (is_numeric_string(Z_STRVAL_P(op1), Z_STRLEN_P(op1), &lval, &dval, 0)) {
 				case IS_LONG:
-					STR_FREE(Z_STRVAL_P(op1));
+					str_efree(Z_STRVAL_P(op1));
 					if (lval == LONG_MIN) {
 						double d = (double)lval;
 						ZVAL_DOUBLE(op1, d-1);
@@ -2014,7 +2000,7 @@ ZEND_API int decrement_function(zval *op1) /* {{{ */
 					}
 					break;
 				case IS_DOUBLE:
-					STR_FREE(Z_STRVAL_P(op1));
+					str_efree(Z_STRVAL_P(op1));
 					ZVAL_DOUBLE(op1, dval - 1);
 					break;
 			}