cvs: php4 /ext/yaz php_yaz.c
| From: | Adam Dickmeiss | Date: | Tue, 05 Nov 2002 09:19:24 +0000 |
| Subject: | cvs: php4 /ext/yaz php_yaz.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-15810@lists.php.net to get a copy of this message | ||
dickmeiss Tue Nov 5 04:19:24 2002 EDT
Modified files:
/php4/ext/yaz php_yaz.c
Log:
Fix handling of zero-length records
Index: php4/ext/yaz/php_yaz.c
diff -u php4/ext/yaz/php_yaz.c:1.55 php4/ext/yaz/php_yaz.c:1.56
--- php4/ext/yaz/php_yaz.c:1.55 Mon Oct 28 05:56:23 2002
+++ php4/ext/yaz/php_yaz.c Tue Nov 5 04:19:23 2002
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_yaz.c,v 1.55 2002/10/28 10:56:23 dickmeiss Exp $ */
+/* $Id: php_yaz.c,v 1.56 2002/11/05 09:19:23 dickmeiss Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -973,17 +973,9 @@
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;
}
}