[mapserver-commits] r12078 - in branches/branch-6-0/mapserver: .
mapscript/php
svn at osgeo.org
svn at osgeo.org
Fri Aug 19 10:59:12 EDT 2011
Author: aboudreault
Date: 2011-08-19 07:59:12 -0700 (Fri, 19 Aug 2011)
New Revision: 12078
Modified:
branches/branch-6-0/mapserver/HISTORY.TXT
branches/branch-6-0/mapserver/mapscript/php/php_mapscript.h
branches/branch-6-0/mapserver/mapscript/php/php_mapscript_util.c
branches/branch-6-0/mapserver/mapscript/php/php_mapscript_util.h
Log:
Backport in branch6.0:
Modified: branches/branch-6-0/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-6-0/mapserver/HISTORY.TXT 2011-08-19 14:37:10 UTC (rev 12077)
+++ branches/branch-6-0/mapserver/HISTORY.TXT 2011-08-19 14:59:12 UTC (rev 12078)
@@ -15,6 +15,8 @@
Current Version (future 6.0.2, SVN branch-6-0):
---------------------------
+- PHP/Mapscript: Segmentation fault when getting complex object using PHP 5.2 (#3930)
+
- Fixed contains operator in logical expresions (#3974)
- Fix incorrect rendering of GD lines between 1 and 2 pixels wide (#3962)
Modified: branches/branch-6-0/mapserver/mapscript/php/php_mapscript.h
===================================================================
--- branches/branch-6-0/mapserver/mapscript/php/php_mapscript.h 2011-08-19 14:37:10 UTC (rev 12077)
+++ branches/branch-6-0/mapserver/mapscript/php/php_mapscript.h 2011-08-19 14:59:12 UTC (rev 12078)
@@ -443,8 +443,7 @@
void (*zend_objects_free_object),
zend_object_handlers *object_handlers TSRMLS_DC);
extern void mapscript_fetch_object(zend_class_entry *ce, zval* zval_parent, php_layer_object* layer,
- void *internal_object, zval **php_object_storage,
- zval ***return_value_ptr TSRMLS_DC);
+ void *internal_object, zval **php_object_storage TSRMLS_DC);
extern void mapscript_create_color(colorObj *color, parent_object parent, zval *return_value TSRMLS_DC);
extern void mapscript_create_rect(rectObj *rect, parent_object php_parent, zval *return_value TSRMLS_DC);
extern void mapscript_create_hashtable(hashTableObj *hashtable, parent_object parent, zval *return_value TSRMLS_DC);
Modified: branches/branch-6-0/mapserver/mapscript/php/php_mapscript_util.c
===================================================================
--- branches/branch-6-0/mapserver/mapscript/php/php_mapscript_util.c 2011-08-19 14:37:10 UTC (rev 12077)
+++ branches/branch-6-0/mapserver/mapscript/php/php_mapscript_util.c 2011-08-19 14:59:12 UTC (rev 12078)
@@ -95,7 +95,7 @@
otherwise it creates it */
void mapscript_fetch_object(zend_class_entry *ce, zval* zval_parent, php_layer_object* layer,
void *internal_object,
- zval **php_object_storage, zval ***return_value_ptr TSRMLS_DC)
+ zval **php_object_storage TSRMLS_DC)
{
parent_object p;
@@ -150,14 +150,5 @@
mapscript_create_layer((layerObj*)internal_object, p, *php_object_storage TSRMLS_CC);
else if (ce == mapscript_ce_cluster)
mapscript_create_cluster((clusterObj*)internal_object, p, *php_object_storage TSRMLS_CC);
-
- MAPSCRIPT_ADDREF(*php_object_storage);
-
- // return a reference to the object
- if (return_value_ptr) {
- zval_ptr_dtor(*return_value_ptr);
- zval_set_isref_p(*php_object_storage);
- **return_value_ptr = *php_object_storage;
- }
}
Modified: branches/branch-6-0/mapserver/mapscript/php/php_mapscript_util.h
===================================================================
--- branches/branch-6-0/mapserver/mapscript/php/php_mapscript_util.h 2011-08-19 14:37:10 UTC (rev 12077)
+++ branches/branch-6-0/mapserver/mapscript/php/php_mapscript_util.h 2011-08-19 14:59:12 UTC (rev 12078)
@@ -43,6 +43,78 @@
#define TSRMLS_CC
#endif
+/* Add pseudo refcount macros for PHP version < 5.3 */
+#ifndef Z_REFCOUNT_PP
+
+#define Z_REFCOUNT_PP(ppz) Z_REFCOUNT_P(*(ppz))
+#define Z_SET_REFCOUNT_PP(ppz, rc) Z_SET_REFCOUNT_P(*(ppz), rc)
+#define Z_ADDREF_PP(ppz) Z_ADDREF_P(*(ppz))
+#define Z_DELREF_PP(ppz) Z_DELREF_P(*(ppz))
+#define Z_ISREF_PP(ppz) Z_ISREF_P(*(ppz))
+#define Z_SET_ISREF_PP(ppz) Z_SET_ISREF_P(*(ppz))
+#define Z_UNSET_ISREF_PP(ppz) Z_UNSET_ISREF_P(*(ppz))
+#define Z_SET_ISREF_TO_PP(ppz, isref) Z_SET_ISREF_TO_P(*(ppz), isref)
+
+#define Z_REFCOUNT_P(pz) zval_refcount_p(pz)
+#define Z_SET_REFCOUNT_P(pz, rc) zval_set_refcount_p(pz, rc)
+#define Z_ADDREF_P(pz) zval_addref_p(pz)
+#define Z_DELREF_P(pz) zval_delref_p(pz)
+#define Z_ISREF_P(pz) zval_isref_p(pz)
+#define Z_SET_ISREF_P(pz) zval_set_isref_p(pz)
+#define Z_UNSET_ISREF_P(pz) zval_unset_isref_p(pz)
+#define Z_SET_ISREF_TO_P(pz, isref) zval_set_isref_to_p(pz, isref)
+
+#define Z_REFCOUNT(z) Z_REFCOUNT_P(&(z))
+#define Z_SET_REFCOUNT(z, rc) Z_SET_REFCOUNT_P(&(z), rc)
+#define Z_ADDREF(z) Z_ADDREF_P(&(z))
+#define Z_DELREF(z) Z_DELREF_P(&(z))
+#define Z_ISREF(z) Z_ISREF_P(&(z))
+#define Z_SET_ISREF(z) Z_SET_ISREF_P(&(z))
+#define Z_UNSET_ISREF(z) Z_UNSET_ISREF_P(&(z))
+#define Z_SET_ISREF_TO(z, isref) Z_SET_ISREF_TO_P(&(z), isref)
+
+#if defined(__GNUC__)
+#define zend_always_inline inline __attribute__((always_inline))
+#elif defined(_MSC_VER)
+#define zend_always_inline __forceinline
+#else
+#define zend_always_inline inline
+#endif
+
+static zend_always_inline zend_uint zval_refcount_p(zval* pz) {
+ return pz->refcount;
+}
+
+static zend_always_inline zend_uint zval_set_refcount_p(zval* pz, zend_uint rc) {
+ return pz->refcount = rc;
+}
+
+static zend_always_inline zend_uint zval_addref_p(zval* pz) {
+ return ++pz->refcount;
+}
+
+static zend_always_inline zend_uint zval_delref_p(zval* pz) {
+ return --pz->refcount;
+}
+
+static zend_always_inline zend_bool zval_isref_p(zval* pz) {
+ return pz->is_ref;
+}
+
+static zend_always_inline zend_bool zval_set_isref_p(zval* pz) {
+ return pz->is_ref = 1;
+}
+
+static zend_always_inline zend_bool zval_unset_isref_p(zval* pz) {
+ return pz->is_ref = 0;
+}
+
+static zend_always_inline zend_bool zval_set_isref_to_p(zval* pz, zend_bool isref) {
+ return pz->is_ref = isref;
+}
+
+#endif
+
/* PHP >=5.3 replaced ZVAL_DELREF by Z_DELREF_P */
#if ZEND_MODULE_API_NO >= 20090626
#define ZVAL_DELREF Z_DELREF_P
@@ -67,7 +139,7 @@
#define MAPSCRIPT_DELREF(zobj) \
if (zobj) \
{ \
- if (READY_TO_DESTROY(zobj)) { \
+ if (Z_REFCOUNT_P(zobj) == 1) { \
zval_ptr_dtor(&zobj); \
} \
else { \
@@ -121,22 +193,17 @@
#define IF_GET_OBJECT(property_name, mapscript_ce, php_object_storage, internal_object) \
if (strcmp(property, property_name)==0) \
{ \
- if (php_object_storage) { \
- MAPSCRIPT_ADDREF(php_object_storage); \
- zval_ptr_dtor(return_value_ptr); \
- zval_set_isref_p(php_object_storage); \
- *return_value_ptr = php_object_storage; \
- return; \
- } \
- mapscript_fetch_object(mapscript_ce, zobj, NULL, (void*)internal_object, \
- &php_object_storage, &return_value_ptr TSRMLS_CC); \
- return; \
+ if (!php_object_storage) { \
+ mapscript_fetch_object(mapscript_ce, zobj, NULL, (void*)internal_object, \
+ &php_object_storage TSRMLS_CC); \
+ } \
+ RETURN_ZVAL(php_object_storage, 1, 0); \
}
#define CHECK_OBJECT(mapscript_ce, php_object_storage, internal_object) \
if (!php_object_storage) { \
mapscript_fetch_object(mapscript_ce, zobj, NULL, (void*)internal_object, \
- &php_object_storage, NULL TSRMLS_CC); \
+ &php_object_storage TSRMLS_CC); \
}
/* helpers for setters */
More information about the mapserver-commits
mailing list