Merge branch 'PHP-7.4'

nikic · nikic · commit 124260c165b9 · 2020-08-14T15:52:31.000+02:00
* PHP-7.4:
  Null terminate the sodium_crypto_kx_keypair() result
diff --git a/ext/sodium/libsodium.c b/ext/sodium/libsodium.c
@@ -2495,6 +2495,7 @@ PHP_FUNCTION(sodium_crypto_kx_keypair)
 		zend_throw_exception(sodium_exception_ce, "internal error", 0);
 		RETURN_THROWS();
 	}
+	ZSTR_VAL(keypair)[crypto_kx_SECRETKEYBYTES + crypto_kx_PUBLICKEYBYTES] = 0;
 	RETURN_STR(keypair);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -2495,6 +2495,7 @@ PHP_FUNCTION(sodium_crypto_kx_keypair)`
`2495`	`2495`	`zend_throw_exception(sodium_exception_ce, "internal error", 0);`
`2496`	`2496`	`RETURN_THROWS();`
`2497`	`2497`	`}`
	`2498`	`+ ZSTR_VAL(keypair)[crypto_kx_SECRETKEYBYTES + crypto_kx_PUBLICKEYBYTES] = 0;`
`2498`	`2499`	`RETURN_STR(keypair);`
`2499`	`2500`	`}`
`2500`	`2501`