ext/pgsql: pg_lo_read addressing the todo. (php#11159)

devnexen · web-flow · commit 2e0f75ec1472 · 2023-05-05T12:41:52.000+01:00
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
@@ -2490,9 +2490,8 @@ PHP_FUNCTION(pg_lo_read)
 		RETURN_FALSE;
 	}
 
-	/* TODO Use truncate API? */
-	ZSTR_LEN(buf) = nbytes;
-	ZSTR_VAL(buf)[ZSTR_LEN(buf)] = '\0';
+	ZSTR_VAL(buf)[nbytes] = '\0';
+	buf = zend_string_truncate(buf, nbytes, 0);
 	RETURN_NEW_STR(buf);
 }
 /* }}} */

Original file line number	Diff line number	Diff line change
`@@ -2490,9 +2490,8 @@ PHP_FUNCTION(pg_lo_read)`
`2490`	`2490`	`RETURN_FALSE;`
`2491`	`2491`	`}`
`2492`	`2492`
`2493`		`- /* TODO Use truncate API? */`
`2494`		`- ZSTR_LEN(buf) = nbytes;`
`2495`		`- ZSTR_VAL(buf)[ZSTR_LEN(buf)] = '\0';`
	`2493`	`+ ZSTR_VAL(buf)[nbytes] = '\0';`
	`2494`	`+ buf = zend_string_truncate(buf, nbytes, 0);`
`2496`	`2495`	`RETURN_NEW_STR(buf);`
`2497`	`2496`	`}`
`2498`	`2497`	`/* }}} */`