diff options
| author | Anatol Belski <ab@php.net> | 2014-08-17 13:31:39 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-08-17 13:31:39 +0200 |
| commit | 90d6f60bc17bb4fea69feeab506eb02bfeec20fd (patch) | |
| tree | f759964466d23656e796bd79964a424464655ee2 /Zend | |
| parent | 977cf1dc11da0363692374951088696855ae293d (diff) | |
| download | php-git-90d6f60bc17bb4fea69feeab506eb02bfeec20fd.tar.gz | |
mostly fixes to spl, but also some other
Diffstat (limited to 'Zend')
| -rw-r--r-- | Zend/zend.h | 2 | ||||
| -rw-r--r-- | Zend/zend_API.c | 2 | ||||
| -rw-r--r-- | Zend/zend_virtual_cwd.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Zend/zend.h b/Zend/zend.h index 3f3d4ce3ac..731a8e5a81 100644 --- a/Zend/zend.h +++ b/Zend/zend.h @@ -655,7 +655,7 @@ extern ZEND_API void (*zend_ticks_function)(int ticks TSRMLS_DC); extern ZEND_API void (*zend_error_cb)(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args) ZEND_ATTRIBUTE_PTR_FORMAT(printf, 4, 0); extern ZEND_API void (*zend_on_timeout)(int seconds TSRMLS_DC); extern ZEND_API int (*zend_stream_open_function)(const char *filename, zend_file_handle *handle TSRMLS_DC); -extern zend_int_t (*zend_vspprintf)(char **pbuf, zend_size_t max_len, const char *format, va_list ap); +extern zend_size_t (*zend_vspprintf)(char **pbuf, zend_size_t max_len, const char *format, va_list ap); extern zend_string *(*zend_vstrpprintf)(zend_size_t max_len, const char *format, va_list ap); extern ZEND_API char *(*zend_getenv)(char *name, size_t name_len TSRMLS_DC); extern ZEND_API char *(*zend_resolve_path)(const char *filename, int filename_len TSRMLS_DC); diff --git a/Zend/zend_API.c b/Zend/zend_API.c index b04de2514a..4bd8760e6a 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -2906,7 +2906,7 @@ static int zend_is_callable_check_class(zend_string *name, zend_fcall_info_cache int name_len = name->len; zend_string *lcname; ALLOCA_FLAG(use_heap); - __debugbreak(); + STR_ALLOCA_ALLOC(lcname, name_len, use_heap); zend_str_tolower_copy(lcname->val, name->val, name_len + 1); diff --git a/Zend/zend_virtual_cwd.c b/Zend/zend_virtual_cwd.c index 1b12f6f0b9..92613c7420 100644 --- a/Zend/zend_virtual_cwd.c +++ b/Zend/zend_virtual_cwd.c @@ -178,7 +178,7 @@ static int php_check_dots(const char *element, int n) #define MAXIMUM_REPARSE_DATA_BUFFER_SIZE ( 16 * 1024 ) typedef struct { - unsigned long ReparseTag; + zend_uint_t ReparseTag; unsigned short ReparseDataLength; unsigned short Reserved; union { @@ -187,7 +187,7 @@ typedef struct { unsigned short SubstituteNameLength; unsigned short PrintNameOffset; unsigned short PrintNameLength; - unsigned long Flags; + zend_uint_t Flags; wchar_t ReparseTarget[1]; } SymbolicLinkReparseBuffer; struct { |