diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2018-02-06 11:37:50 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2018-02-06 11:37:50 +0100 |
| commit | e2a58df36ba6d105a7344765b4cb675c26c23f53 (patch) | |
| tree | 970e64e4ac1b83f28d0628d654cfe1a049f96899 /php/src | |
| parent | Catch exception by const& when appropriate (ICE-8632) (diff) | |
| download | ice-e2a58df36ba6d105a7344765b4cb675c26c23f53.tar.bz2 ice-e2a58df36ba6d105a7344765b4cb675c26c23f53.tar.xz ice-e2a58df36ba6d105a7344765b4cb675c26c23f53.zip | |
Fixed bogus assert when compiling PHP module with debug (ICE-8629)
Diffstat (limited to 'php/src')
| -rw-r--r-- | php/src/php5/Types.cpp | 2 | ||||
| -rw-r--r-- | php/src/php7/Operation.cpp | 1 | ||||
| -rw-r--r-- | php/src/php7/Types.cpp | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/php/src/php5/Types.cpp b/php/src/php5/Types.cpp index 34934b5079b..80e8f8a640c 100644 --- a/php/src/php5/Types.cpp +++ b/php/src/php5/Types.cpp @@ -115,7 +115,7 @@ addClassInfoByName(const ClassInfoPtr& p TSRMLS_DC) { assert(!getClassInfoByName(p->name TSRMLS_CC)); #ifdef ICEPHP_USE_NAMESPACES - assert(name[0] == '\\'); + assert(p->name[0] == '\\'); #endif ClassInfoMap* m = reinterpret_cast<ClassInfoMap*>(ICE_G(nameToClassInfoMap)); diff --git a/php/src/php7/Operation.cpp b/php/src/php7/Operation.cpp index 81b05817eb7..7cbcb809503 100644 --- a/php/src/php7/Operation.cpp +++ b/php/src/php7/Operation.cpp @@ -363,7 +363,6 @@ IcePHP::OperationI::convertParam(zval* p, int pos) { assert(Z_TYPE_P(p) == IS_ARRAY); HashTable* arr = Z_ARRVAL_P(p); - assert(zend_hash_num_elements(arr) == 3); ParamInfoPtr param = new ParamInfo; diff --git a/php/src/php7/Types.cpp b/php/src/php7/Types.cpp index aed89c552fa..8ddf6a87461 100644 --- a/php/src/php7/Types.cpp +++ b/php/src/php7/Types.cpp @@ -115,7 +115,7 @@ addClassInfoByName(const ClassInfoPtr& p) { assert(!getClassInfoByName(p->name)); #ifdef ICEPHP_USE_NAMESPACES - assert(name[0] == '\\'); + assert(p->name[0] == '\\'); #endif ClassInfoMap* m = reinterpret_cast<ClassInfoMap*>(ICE_G(nameToClassInfoMap)); |