pajoye                                   Wed, 02 Jun 2010 19:20:04 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=300102

Log:
- silent warning

Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/session/session.c
    U   php/php-src/trunk/ext/session/session.c

Modified: php/php-src/branches/PHP_5_3/ext/session/session.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/session/session.c  2010-06-02 18:45:11 UTC 
(rev 300101)
+++ php/php-src/branches/PHP_5_3/ext/session/session.c  2010-06-02 19:20:04 UTC 
(rev 300102)
@@ -456,8 +456,8 @@
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "The ini setting 
hash_bits_per_character is out of range (should be 4, 5, or 6) - using 4 for 
now");
        }

-       outid = emalloc((digest_len + 2) * ((8.0f / 
PS(hash_bits_per_character)) + 0.5));
-       j = (int) (bin_to_readable((char *)digest, digest_len, outid, 
PS(hash_bits_per_character)) - outid);
+       outid = emalloc((size_t)((digest_len + 2) * ((8.0f / 
PS(hash_bits_per_character)) + 0.5)));
+       j = (int) (bin_to_readable((char *)digest, digest_len, outid, 
(char)PS(hash_bits_per_character)) - outid);
        efree(digest);

        if (newlen) {

Modified: php/php-src/trunk/ext/session/session.c
===================================================================
--- php/php-src/trunk/ext/session/session.c     2010-06-02 18:45:11 UTC (rev 
300101)
+++ php/php-src/trunk/ext/session/session.c     2010-06-02 19:20:04 UTC (rev 
300102)
@@ -382,8 +382,8 @@
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "The ini setting 
hash_bits_per_character is out of range (should be 4, 5, or 6) - using 4 for 
now");
        }

-       outid = emalloc((digest_len + 2) * ((8.0f / 
PS(hash_bits_per_character)) + 0.5));
-       j = (int) (bin_to_readable((char *)digest, digest_len, outid, 
PS(hash_bits_per_character)) - outid);
+       outid = emalloc((size_t)((digest_len + 2) * ((8.0f / 
PS(hash_bits_per_character)) + 0.5)));
+       j = (int) (bin_to_readable((char *)digest, digest_len, outid, 
(char)PS(hash_bits_per_character)) - outid);
        efree(digest);

        if (newlen) {

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to