Changeset 556 for trunk

Timestamp:

Feb 9, 2015, 11:16:06 AM (10 years ago)

Author:

knut

Message:

Added null pointer checks in service_internal_php.c. In WIN32 version, fixed problem loading PHP scripts by disabling FastCGI wrappers in service_internal_php.c.

Location:

trunk/zoo-project/zoo-kernel

Files:

• service_internal_php.c (modified) (6 diffs)
• service_internal_php.h (modified) (1 diff)

trunk/zoo-project/zoo-kernel/service_internal_php.c

@@ -23 +23 @@
  */
 
+#ifdef WIN32
+  #define NO_FCGI_DEFINES
+#endif
+ 
 #include "service_internal_php.h"
 
@@ -37 +41 @@
 map* php_map_from_HasTable(HashTable* t);
 
-int zoo_php_support(maps** main_conf,map* request,service* s,maps **real_inputs,maps **real_outputs){
+int zoo_php_support(maps** main_conf,map* request,service* s,maps **real_inputs,maps **real_outputs){   
   maps* m=*main_conf;
   maps* inputs=*real_inputs;
@@ -63 +67 @@
 
   php_embed_init(0,NULL,&tsrm_ls);
-  
+   
   zend_try {
+
     php_execute_script(&iscript TSRMLS_CC);
 
@@ -118 +123 @@
   tres=array_init(mapArray);
   while(tmp!=NULL){
-    map* sMap=getMapArray(tmp,"size",0);
-    if(strncmp(tmp->name,"value",5)==0 && sMap!=NULL){
+    map* sMap=getMapArray(tmp,"size",0);    
+        if(strncmp(tmp->name,"value",5)==0 && sMap!=NULL && tmp->value != NULL){
       tres=add_assoc_stringl(mapArray,tmp->name,tmp->value,atoi(sMap->value),1);
-    }else
+        } 
+        else if (tmp->value != NULL) {
       tres=add_assoc_string(mapArray,tmp->name,tmp->value,1);
+        }
     tmp=tmp->next;
   }
@@ -170 +177 @@
       cursor->name=strdup(key);
     }
-    fprintf(stderr,"key : %s\n",key);
+#ifdef DEBUG    
+    fprintf(stderr,"key : %s\n",key);
+#endif  
     HashTable* t=HASH_OF(*ppzval);
 #ifdef DEBUG
@@ -246 +255 @@
   return final_res;
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/zoo-project/zoo-kernel/service_internal_php.h

@@ -26 +26 @@
 #define ZOO_SERVICE_INTERNAL_PHP_H 1
 
-#pragma once 
+#pragma once
 
 #include "service.h"