-
-
Save anonymous/3b95740f9008e008b0c6f202e410d996 to your computer and use it in GitHub Desktop.
Patch for 72782
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
commit 4f6a97f5321ef617b98a1f79aac1ad447d13b2b4 | |
Author: Stanislav Malyshev <stas@php.net> | |
Date: Wed Aug 10 22:33:18 2016 -0700 | |
Fix for bug #72782: mcrypt accepts only ints, so don't pass anything else | |
diff --git a/ext/mcrypt/mcrypt.c b/ext/mcrypt/mcrypt.c | |
index 73acaa2..9865cbb 100644 | |
--- a/ext/mcrypt/mcrypt.c | |
+++ b/ext/mcrypt/mcrypt.c | |
@@ -633,6 +633,10 @@ PHP_FUNCTION(mcrypt_generic) | |
RETURN_FALSE | |
} | |
+ if (data_len > INT_MAX) { | |
+ php_error_docref(NULL, E_WARNING, "Data size too large, %d maximum", INT_MAX); | |
+ RETURN_FALSE; | |
+ } | |
/* Check blocksize */ | |
if (mcrypt_enc_is_block_mode(pm->td) == 1) { /* It's a block algorithm */ | |
block_size = mcrypt_enc_get_block_size(pm->td); | |
@@ -645,10 +649,6 @@ PHP_FUNCTION(mcrypt_generic) | |
memset(ZSTR_VAL(data_str), 0, data_size); | |
memcpy(ZSTR_VAL(data_str), data, data_len); | |
} else { /* It's not a block algorithm */ | |
- if (data_len > INT_MAX) { | |
- php_error_docref(NULL, E_WARNING, "Data size too large, %d maximum", INT_MAX); | |
- RETURN_FALSE; | |
- } | |
data_size = (int)data_len; | |
data_str = zend_string_alloc(data_size, 0); | |
memset(ZSTR_VAL(data_str), 0, data_size); | |
@@ -688,6 +688,10 @@ PHP_FUNCTION(mdecrypt_generic) | |
} | |
/* Check blocksize */ | |
+ if (data_len > INT_MAX) { | |
+ php_error_docref(NULL, E_WARNING, "Data size too large, %d maximum", INT_MAX); | |
+ RETURN_FALSE; | |
+ } | |
if (mcrypt_enc_is_block_mode(pm->td) == 1) { /* It's a block algorithm */ | |
block_size = mcrypt_enc_get_block_size(pm->td); | |
data_size = ((((int)data_len - 1) / block_size) + 1) * block_size; | |
@@ -699,10 +703,6 @@ PHP_FUNCTION(mdecrypt_generic) | |
memset(data_s, 0, data_size); | |
memcpy(data_s, data, data_len); | |
} else { /* It's not a block algorithm */ | |
- if (data_len > INT_MAX) { | |
- php_error_docref(NULL, E_WARNING, "Data size too large, %d maximum", INT_MAX); | |
- RETURN_FALSE; | |
- } | |
data_size = (int)data_len; | |
data_s = emalloc(data_size + 1); | |
memset(data_s, 0, data_size); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment