[srm-cvs] CVS Update: - Fix bug with empty lists

Date: Fri Apr 12 19:52:19 CEST 2002
User: Derick Rethans
Directory: php_srm

Log Message:
 [0.25]
 - Fix bug with empty lists
 
Modified files:
           php_srm/srm_util.c (version: 1.8)

[FILE: /php_srm/srm_util.c]

--- php_srm/srm_util.c:1.7 Wed Feb 20 07:03:42 2002 GMT
+++ php_srm/srm_util.c Fri Apr 12 15:52:18 2002 GMT
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: cvstemp,v 1.7 2002/02/20 08:03:42 derick Exp $ */
+/* $Id: cvstemp,v 1.8 2002/04/12 17:52:18 derick Exp $ */
 
 #include <srm_client.h>
 #include <php.h>
@@ -137,17 +137,19 @@
 
                         array_init(result_array);
                         e = SRM_LLIST_HEAD(SRMVALP_LIST (value));
- do {
- srm_result = SRM_LLIST_VALP (e);
- test = srmval_to_zval(srm_result, 1);
-
- if (add_next_index_zval(result_array, test) == FAILURE) {
- php_error(E_WARNING, "php_srm: srmval_to_zval() - Couldn't insert a zval into the result array");
- FREE_ZVAL(result_array);
- ZVAL_NULL(result);
- return result;
- }
- } while ((e = SRM_LLIST_NEXT(e)) != NULL);
+ if (e) {
+ do {
+ srm_result = SRM_LLIST_VALP (e);
+ test = srmval_to_zval(srm_result, 1);
+
+ if (add_next_index_zval(result_array, test) == FAILURE) {
+ php_error(E_WARNING, "php_srm: srmval_to_zval() - Couldn't insert a zval into the result array");
+ FREE_ZVAL(result_array);
+ ZVAL_NULL(result);
+ return result;
+ }
+ } while ((e = SRM_LLIST_NEXT(e)) != NULL);
+ }
 
                         if (alloc == 1)
                                 FREE_ZVAL(result);
Received on Fri Apr 12 20:49:37 2002