summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Dickmeiss <dickmeiss@php.net>2002-11-05 09:19:24 +0000
committerAdam Dickmeiss <dickmeiss@php.net>2002-11-05 09:19:24 +0000
commit752f0b0abf4f5424f21a6dc97ac176f848ea3773 (patch)
tree6f1615d56411f8288125c483cf1b922bbf29aa91
parent2bcca9e315833779bd2ae342359f99b521b7c3a4 (diff)
downloadphp-git-752f0b0abf4f5424f21a6dc97ac176f848ea3773.tar.gz
Fix handling of zero-length records
-rw-r--r--ext/yaz/php_yaz.c14
1 files changed, 3 insertions, 11 deletions
diff --git a/ext/yaz/php_yaz.c b/ext/yaz/php_yaz.c
index 9728231ab2..f7445e0fa6 100644
--- a/ext/yaz/php_yaz.c
+++ b/ext/yaz/php_yaz.c
@@ -973,17 +973,9 @@ PHP_FUNCTION(yaz_record)
int rlen;
const char *info = ZOOM_record_get (r, type, &rlen);
- if (rlen <= 0)
- {
- return_value->value.str.len = 0;
- return_value->value.str.val = "";
- }
- else
- {
- return_value->value.str.len = rlen;
- return_value->value.str.val =
- estrndup(info, return_value->value.str.len);
- }
+ return_value->value.str.len = (rlen > 0) ? rlen : 0;
+ return_value->value.str.val =
+ estrndup(info, return_value->value.str.len);
return_value->type = IS_STRING;
}
}