From: Nikita Popov <nikita.ppv@gmail.com>
Date: Fri, 14 Aug 2020 13:52:31 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=124260c165b955b3b646c445b2e26fbc801139de;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  Null terminate the sodium_crypto_kx_keypair() result
---

124260c165b955b3b646c445b2e26fbc801139de
diff --cc ext/sodium/libsodium.c
index 7a1751b394,abde3b8994..18f7d3db1d
--- a/ext/sodium/libsodium.c
+++ b/ext/sodium/libsodium.c
@@@ -2493,8 -2900,9 +2493,9 @@@ PHP_FUNCTION(sodium_crypto_kx_keypair
  	randombytes_buf(sk, crypto_kx_SECRETKEYBYTES);
  	if (crypto_scalarmult_base(pk, sk) != 0) {
  		zend_throw_exception(sodium_exception_ce, "internal error", 0);
 -		return;
 +		RETURN_THROWS();
  	}
+ 	ZSTR_VAL(keypair)[crypto_kx_SECRETKEYBYTES + crypto_kx_PUBLICKEYBYTES] = 0;
  	RETURN_STR(keypair);
  }