Fix bugs php#7301, php#6827

zsuraski · zsuraski · commit b8624e7e08dd · 2001-08-18T16:56:34.000Z
diff --git a/ext/msql/php_msql.c b/ext/msql/php_msql.c
@@ -849,11 +849,10 @@ PHP_FUNCTION(msql_result)
 			return_value->value.str.len = (sql_row[field_offset]?strlen(sql_row[field_offset]):0);
 			return_value->value.str.val = (char *) safe_estrndup(sql_row[field_offset],return_value->value.str.len);
 		}
+		return_value->type = IS_STRING;
 	} else {
 		ZVAL_FALSE(return_value);
 	}
-	
-	return_value->type = IS_STRING;
 }
 /* }}} */
 

Original file line number	Diff line number	Diff line change
`@@ -849,11 +849,10 @@ PHP_FUNCTION(msql_result)`
`849`	`849`	`return_value->value.str.len = (sql_row[field_offset]?strlen(sql_row[field_offset]):0);`
`850`	`850`	`return_value->value.str.val = (char *) safe_estrndup(sql_row[field_offset],return_value->value.str.len);`
`851`	`851`	`}`
	`852`	`+ return_value->type = IS_STRING;`
`852`	`853`	`} else {`
`853`	`854`	`ZVAL_FALSE(return_value);`
`854`	`855`	`}`
`855`		`-`
`856`		`- return_value->type = IS_STRING;`
`857`	`856`	`}`
`858`	`857`	`/* }}} */`
`859`	`858`