summaryrefslogtreecommitdiff
path: root/php/src/php5
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2019-07-11 13:15:09 +0200
committerBenoit Foucher <benoit@zeroc.com>2019-07-11 13:15:09 +0200
commit7f7401b4e626b7e917dea9dc84c992ddfa305ef6 (patch)
tree8d6ae2d3b7199cff193b7def6eeedbc6257d1a36 /php/src/php5
parentFixed another Java IceSSL failure on RHEL8, fixes #431 (diff)
downloadice-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/php5')
-rw-r--r--php/src/php5/Types.cpp12
1 files changed, 6 insertions, 6 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: