summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ext/standard/string.c15
1 files changed, 3 insertions, 12 deletions
diff --git a/ext/standard/string.c b/ext/standard/string.c
index 132118661d..ceafe56811 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -2331,14 +2331,9 @@ PHPAPI void php_stripslashes(char *str, int *len TSRMLS_DC)
l--;
}
*s++ = *t++;
- } else if (*t == '\\' && l > 0) {
- if(t[1] == '0') {
- *s++='\0';
- t++;
- } else {
- *s++=*(++t);
- }
- t++;
+ } else if (*t == '\\' && t[1] == '0' && l > 0) {
+ *s++='\0';
+ t+=2;
if (len != NULL) {
(*len)--;
}
@@ -2633,10 +2628,6 @@ PHPAPI char *php_addslashes(char *str, int length, int *new_length, int should_f
*target++ = '\'';
*target++ = '\'';
break;
- case '\\':
- *target++ = '\\';
- *target++ = '\\';
- break;
default:
*target++ = *source;
break;