Merge branch 'PHP-7.3' into PHP-7.4

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

Original file line number	Diff line number	Diff line change
`@@ -2902,6 +2902,7 @@ PHP_FUNCTION(sodium_crypto_kx_keypair)`
`2902`	`2902`	`zend_throw_exception(sodium_exception_ce, "internal error", 0);`
`2903`	`2903`	`return;`
`2904`	`2904`	`}`
	`2905`	`+ ZSTR_VAL(keypair)[crypto_kx_SECRETKEYBYTES + crypto_kx_PUBLICKEYBYTES] = 0;`
`2905`	`2906`	`RETURN_STR(keypair);`
`2906`	`2907`	`}`
`2907`	`2908`