]> granicus.if.org Git - php/commitdiff
fix datatype mismatches
authorAnatol Belski <ab@php.net>
Tue, 24 Mar 2015 20:24:49 +0000 (21:24 +0100)
committerAnatol Belski <ab@php.net>
Tue, 24 Mar 2015 21:02:33 +0000 (22:02 +0100)
ext/session/mod_files.c
ext/session/session.c

index db88b29f200613a7144033e81d0069c8e2f14473..f325f3e816c8c64218dbae4f86031992a9bc424d 100644 (file)
@@ -378,7 +378,7 @@ PS_OPEN_FUNC(files)
 
        if (argc > 2) {
                errno = 0;
-               filemode = ZEND_STRTOL(argv[1], NULL, 8);
+               filemode = (int)ZEND_STRTOL(argv[1], NULL, 8);
                if (errno == ERANGE || filemode < 0 || filemode > 07777) {
                        php_error(E_WARNING, "The second parameter in session.save_path is invalid");
                        return FAILURE;
index eed91fc90a8662fd9974537f491225333ff93b10..71d4cd133f188b920417faf6801ef1a07925e356 100644 (file)
@@ -767,8 +767,8 @@ static PHP_INI_MH(OnUpdateHashFunc) /* {{{ */
 
 static PHP_INI_MH(OnUpdateRfc1867Freq) /* {{{ */
 {
-       zend_long tmp;
-       tmp = zend_atoi(new_value->val, new_value->len);
+       int tmp;
+       tmp = zend_atoi(new_value->val, (int)new_value->len);
        if(tmp < 0) {
                php_error_docref(NULL, E_WARNING, "session.upload_progress.freq must be greater than or equal to zero");
                return FAILURE;