Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3: Fix bug #77646
php · Feb 21, 2019 · 9609950 · 9609950
2 parents be6f1f6 + e7ca69f
commit 9609950
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/NEWS b/NEWS
@@ -74,6 +74,9 @@ PHP                                                                        NEWS
 - Sockets:
   . Fixed bug #67619 (Validate length on socket_write). (thiagooak)
 
+- sodium:
+  . Fixed bug #77646 (sign_detached() strings not terminated). (jedisct1)
+
 - SQLite3:
   . Unbundled libsqlite. (cmb)
   . Raised requirements to SQLite 3.7.4. (cmb)

diff --git a/ext/sodium/libsodium.c b/ext/sodium/libsodium.c
@@ -1677,7 +1677,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_NEW_STR(signature);
 }