Merge branch 'PHP-7.3' into PHP-7.4

jedisct1 · jedisct1 · commit 9609950331f8 · 2019-02-21T16:19:44.000+01:00
* PHP-7.3:
  Fix bug #77646
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);
 }

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