diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2019-07-11 13:15:09 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2019-07-11 13:15:09 +0200 |
| commit | 7f7401b4e626b7e917dea9dc84c992ddfa305ef6 (patch) | |
| tree | 8d6ae2d3b7199cff193b7def6eeedbc6257d1a36 /php/src | |
| parent | Fixed another Java IceSSL failure on RHEL8, fixes #431 (diff) | |
| download | ice-7f7401b4e626b7e917dea9dc84c992ddfa305ef6.tar.bz2 ice-7f7401b4e626b7e917dea9dc84c992ddfa305ef6.tar.xz ice-7f7401b4e626b7e917dea9dc84c992ddfa305ef6.zip | |
Fixed Ruby crash (and similar issues in other mappings), fixes #432
Diffstat (limited to 'php/src')
| -rw-r--r-- | php/src/php5/Types.cpp | 12 | ||||
| -rw-r--r-- | php/src/php7/Types.cpp | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/php/src/php5/Types.cpp b/php/src/php5/Types.cpp index 79fb6d2ca5b..061a5007fb7 100644 --- a/php/src/php5/Types.cpp +++ b/php/src/php5/Types.cpp @@ -1794,7 +1794,7 @@ IcePHP::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, zval* seq[i++] = static_cast<Ice::Byte>(l); zend_hash_move_forward_ex(arr, &pos); } - os->write(&seq[0], &seq[0] + seq.size()); + os->write(seq); break; } case PrimitiveInfo::KindShort: @@ -1814,7 +1814,7 @@ IcePHP::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, zval* seq[i++] = static_cast<Ice::Short>(l); zend_hash_move_forward_ex(arr, &pos); } - os->write(&seq[0], &seq[0] + seq.size()); + os->write(seq); break; } case PrimitiveInfo::KindInt: @@ -1834,7 +1834,7 @@ IcePHP::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, zval* seq[i++] = static_cast<Ice::Int>(l); zend_hash_move_forward_ex(arr, &pos); } - os->write(&seq[0], &seq[0] + seq.size()); + os->write(seq); break; } case PrimitiveInfo::KindLong: @@ -1867,7 +1867,7 @@ IcePHP::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, zval* seq[i++] = l; zend_hash_move_forward_ex(arr, &pos); } - os->write(&seq[0], &seq[0] + seq.size()); + os->write(seq); break; } case PrimitiveInfo::KindFloat: @@ -1898,7 +1898,7 @@ IcePHP::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, zval* seq[i++] = static_cast<Ice::Float>(d); zend_hash_move_forward_ex(arr, &pos); } - os->write(&seq[0], &seq[0] + seq.size()); + os->write(seq); break; } case PrimitiveInfo::KindDouble: @@ -1929,7 +1929,7 @@ IcePHP::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, zval* seq[i++] = d; zend_hash_move_forward_ex(arr, &pos); } - os->write(&seq[0], &seq[0] + seq.size()); + os->write(seq); break; } case PrimitiveInfo::KindString: diff --git a/php/src/php7/Types.cpp b/php/src/php7/Types.cpp index d5d3d528ba3..63fdbc7dbe1 100644 --- a/php/src/php7/Types.cpp +++ b/php/src/php7/Types.cpp @@ -1753,7 +1753,7 @@ IcePHP::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, zval* } ZEND_HASH_FOREACH_END(); - os->write(&seq[0], &seq[0] + seq.size()); + os->write(seq); break; } case PrimitiveInfo::KindShort: @@ -1773,7 +1773,7 @@ IcePHP::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, zval* } ZEND_HASH_FOREACH_END(); - os->write(&seq[0], &seq[0] + seq.size()); + os->write(seq); break; } case PrimitiveInfo::KindInt: @@ -1793,7 +1793,7 @@ IcePHP::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, zval* } ZEND_HASH_FOREACH_END(); - os->write(&seq[0], &seq[0] + seq.size()); + os->write(seq); break; } case PrimitiveInfo::KindLong: @@ -1826,7 +1826,7 @@ IcePHP::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, zval* } ZEND_HASH_FOREACH_END(); - os->write(&seq[0], &seq[0] + seq.size()); + os->write(seq); break; } case PrimitiveInfo::KindFloat: @@ -1857,7 +1857,7 @@ IcePHP::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, zval* } ZEND_HASH_FOREACH_END(); - os->write(&seq[0], &seq[0] + seq.size()); + os->write(seq); break; } case PrimitiveInfo::KindDouble: @@ -1888,7 +1888,7 @@ IcePHP::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, zval* } ZEND_HASH_FOREACH_END(); - os->write(&seq[0], &seq[0] + seq.size()); + os->write(seq); break; } case PrimitiveInfo::KindString: |