[BACK]Return to ftok.c CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / php / ext / standard

Diff for /embedaddon/php/ext/standard/ftok.c between versions 1.1.1.1 and 1.1.1.3

version 1.1.1.1, 2012/02/21 23:48:02 version 1.1.1.3, 2013/07/22 01:32:05
Line 2 Line 2
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
    | PHP Version 5                                                        |     | PHP Version 5                                                        |
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
   | Copyright (c) 1997-2012 The PHP Group                                |   | Copyright (c) 1997-2013 The PHP Group                                |
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |     | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |     | that is bundled with this package in the file LICENSE, and is        |
Line 35  PHP_FUNCTION(ftok) Line 35  PHP_FUNCTION(ftok)
         int pathname_len, proj_len;          int pathname_len, proj_len;
         key_t k;          key_t k;
   
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &pathname, &pathname_len, &proj, &proj_len) == FAILURE) {        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ps", &pathname, &pathname_len, &proj, &proj_len) == FAILURE) {
                 return;                  return;
         }          }
   
         if (strlen(pathname) != pathname_len) {  
                 RETURN_FALSE;  
         }  
   
         if (pathname_len == 0){          if (pathname_len == 0){
                 php_error_docref(NULL TSRMLS_CC, E_WARNING, "Pathname is invalid");                  php_error_docref(NULL TSRMLS_CC, E_WARNING, "Pathname is invalid");
                 RETURN_LONG(-1);                  RETURN_LONG(-1);
Line 51  PHP_FUNCTION(ftok) Line 47  PHP_FUNCTION(ftok)
         if (proj_len != 1){          if (proj_len != 1){
                 php_error_docref(NULL TSRMLS_CC, E_WARNING, "Project identifier is invalid");                  php_error_docref(NULL TSRMLS_CC, E_WARNING, "Project identifier is invalid");
                 RETURN_LONG(-1);                  RETURN_LONG(-1);
    }        }
   
        if ((PG(safe_mode) && (!php_checkuid(pathname, NULL, CHECKUID_CHECK_FILE_AND_DIR))) || php_check_open_basedir(pathname TSRMLS_CC)) {        if (php_check_open_basedir(pathname TSRMLS_CC)) {
                 RETURN_LONG(-1);                  RETURN_LONG(-1);
         }          }
   
Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.3

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>