com php-src: sodium ext: If sodium_init() returns 1 , this is fine.: ext/sodium/libsodium.c
| From: | Frank Denis | Date: | Tue, 22 Aug 2017 07:40:38 +0000 |
| Subject: | com php-src: sodium ext: If sodium_init() returns 1 , this is fine.: ext/sodium/libsodium.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-99127@lists.php.net to get a copy of this message | ||
Commit: 3fff74aab5e41195cded72ca705de015abfd710a
Author: Frank Denis <github@pureftpd.org> Tue, 22 Aug 2017 09:39:01 +0200
Parents: 708349eeac70490bd97ae59a80d866283a1e3311
Branches: PHP-7.2
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3fff74aab5e41195cded72ca705de015abfd710a
Log:
sodium ext: If sodium_init() returns 1, this is fine.
We actually want to do this so that multiple extensions using libsodium
can be loaded simultaneously.
Changed paths:
M ext/sodium/libsodium.c
Diff:
diff --git a/ext/sodium/libsodium.c b/ext/sodium/libsodium.c
index 69f737f..e8a1491 100644
--- a/ext/sodium/libsodium.c
+++ b/ext/sodium/libsodium.c
@@ -341,7 +341,7 @@ PHP_MINIT_FUNCTION(sodium)
{
zend_class_entry ce;
- if (sodium_init() != 0) {
+ if (sodium_init() < 0) {
zend_error(E_ERROR, "sodium_init()");
}