summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorHartmut Holzgraefe <hholzgra@php.net>2000-07-20 23:08:26 +0000
committerHartmut Holzgraefe <hholzgra@php.net>2000-07-20 23:08:26 +0000
commit5390b6a291024f9d74e2f4da39b32872c47149b3 (patch)
tree91d606ba22664a25e9b3d8df2f3951574fde815e /ext
parent0690bca499960c872cf5e832eed30480f95979dd (diff)
downloadphp-git-5390b6a291024f9d74e2f4da39b32872c47149b3.tar.gz
fix for bug #5707
Diffstat (limited to 'ext')
-rw-r--r--ext/standard/string.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/ext/standard/string.c b/ext/standard/string.c
index 65a261eb7c..dd761f1da0 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -552,6 +552,8 @@ PHPAPI void php_dirname(char *str, int len) {
#endif
)
*c='\0';
+ else
+ *str='\0';
}
/* {{{ proto string dirname(string path)
@@ -567,7 +569,11 @@ PHP_FUNCTION(dirname)
convert_to_string_ex(str);
ret = estrdup((*str)->value.str.val);
php_dirname(ret,(*str)->value.str.len);
- RETVAL_STRING(ret,1);
+ if(*ret) {
+ RETVAL_STRING(ret,1);
+ } else {
+ RETVAL_FALSE;
+ }
efree(ret);
}
/* }}} */