Fix bug #77646

php · Feb 21, 2019 · 08089b5 · 08089b5
1 parent 934691f
commit 08089b5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
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);
 }