Fix bug #77646

jedisct1 · jedisct1 · commit 08089b575bdd · 2019-02-21T16:33:03.000+01:00
diff --git a/NEWS b/NEWS
@@ -5,6 +5,9 @@ PHP                                                                        NEWS
 - MySQLi:
   . Fixed bug #77597 (mysqli_fetch_field hangs scripts). (Nikita)
 
+- sodium:
+  . Fixed bug #77646 (sign_detached() strings not terminated). (Frank)
+
 07 Mar 2019, PHP 7.2.16
 
 - Core:
diff --git a/ext/sodium/libsodium.c b/ext/sodium/libsodium.c
@@ -1678,7 +1678,8 @@ PHP_FUNCTION(sodium_crypto_sign_detached)
 		zend_throw_exception(sodium_exception_ce, "signature has a bogus size", 0);
 		return;
 	}
-	ZEND_ASSERT(ZSTR_VAL(signature)[signature_real_len] == 0);
+	PHP_SODIUM_ZSTR_TRUNCATE(signature, (size_t) signature_real_len);
+	ZSTR_VAL(signature)[signature_real_len] = 0;
 
 	RETURN_STR(signature);
 }

Original file line number	Diff line number	Diff line change
`@@ -1678,7 +1678,8 @@ PHP_FUNCTION(sodium_crypto_sign_detached)`
`1678`	`1678`	`zend_throw_exception(sodium_exception_ce, "signature has a bogus size", 0);`
`1679`	`1679`	`return;`
`1680`	`1680`	`}`
`1681`		`- ZEND_ASSERT(ZSTR_VAL(signature)[signature_real_len] == 0);`
	`1681`	`+ PHP_SODIUM_ZSTR_TRUNCATE(signature, (size_t) signature_real_len);`
	`1682`	`+ ZSTR_VAL(signature)[signature_real_len] = 0;`
`1682`	`1683`
`1683`	`1684`	`RETURN_STR(signature);`
`1684`	`1685`	`}`