Fix?

Author: Girgias

ext/pdo_dblib/dblib_driver.c

@@ -172,19 +172,19 @@ static zend_string* dblib_handle_quoter(pdo_dbh_t *dbh, const zend_string *unquo
 	}
 	quoted_str = zend_string_alloc(quotedlen, 0);
 	if (use_national_character_set) {
-		*ZSTR_VAL(quoted_str)++ = 'N';
+		*(ZSTR_VAL(quoted_str))++ = 'N';
 	}
-	*ZSTR_VAL(quoted_str)++ = '\'';
+	*(ZSTR_VAL(quoted_str))++ = '\'';
 
 	for (i = 0; i < ZSTR_LEN(unquoted); i++) {
 		if (ZSTR_VAL(unquoted)[i] == '\'') {
-			*ZSTR_VAL(quoted_str)++ = '\'';
-			*ZSTR_VAL(quoted_str)++ = '\'';
+			*(ZSTR_VAL(quoted_str))++ = '\'';
+			*(ZSTR_VAL(quoted_str))++ = '\'';
 		} else {
-			*ZSTR_VAL(quoted_str)++ = ZSTR_VAL(unquoted)[i];
+			*(ZSTR_VAL(quoted_str))++ = ZSTR_VAL(unquoted)[i];
 		}
 	}
-	*ZSTR_VAL(quoted_str) = '\'';
+	*(ZSTR_VAL(quoted_str)) = '\'';
 	return quoted_str;
 }
 

ext/pdo_firebird/firebird_driver.c

@@ -654,6 +654,7 @@ static zend_string* firebird_handle_quoter(pdo_dbh_t *dbh, const zend_string *un
 	int qcount = 0;
 	char const *co, *l, *r;
 	size_t quotedlen;
+	char *start;
 	zend_string *quoted_str;
 
 	if (ZSTR_LEN(unquoted) == 0) {
@@ -666,18 +667,19 @@ static zend_string* firebird_handle_quoter(pdo_dbh_t *dbh, const zend_string *un
 
 	quotedlen = ZSTR_LEN(unquoted) + qcount + 2;
 	quoted_str = zend_string_alloc(quotedlen, 0);
-	*ZSTR_VAL(quoted_str)++ = '\'';
+	start = ZSTR_VAL(quoted_str);
+	*(ZSTR_VAL(quoted_str))++ = '\'';
 
 	/* foreach (chunk that ends in a quote) */
 	for (l = ZSTR_VAL(unquoted); (r = strchr(l,'\'')); l = r+1) {
 		strncpy(ZSTR_VAL(quoted_str), l, r-l+1);
-		ZSTR_VAL(quoted_str) += (r-l+1);
+		*(ZSTR_VAL(quoted_str)) += (r-l+1);
 		/* add the second quote */
-		*ZSTR_VAL(quoted_str)++ = '\'';
+		*(ZSTR_VAL(quoted_str))++ = '\'';
 	}
 
 	/* copy the remainder */
-	strncpy(ZSTR_VAL(quoted_str), l, quotedlen-(c-quoted)-1);
+	strncpy(ZSTR_VAL(quoted_str), l, quotedlen-(start-ZSTR_VAL(quoted_str))-1);
 	ZSTR_VAL(quoted_str)[quotedlen-1] = '\'';
 	ZSTR_VAL(quoted_str)[quotedlen]   = '\0';