Rooba
/
flatbuffers
mirror of https://github.com/google/flatbuffers.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #778 from armen/master 

Correct the max/min signed/unsigned 32-bit int
This commit is contained in:
Wouter van Oortmerssen 2015-12-07 10:27:27 -08:00
parent b0d5bb1c4b f622e5996c
commit 163d04a5d2
2 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
php/ByteBuffer.php
View File

@ -239,7 +239,9 @@ class ByteBuffer
*/ */
public function putInt($offset, $value) public function putInt($offset, $value)
{ {
self::validateValue(~PHP_INT_MAX, PHP_INT_MAX, $value, "int"); // 2147483647 = (1 << 31) -1 = Maximum signed 32-bit int
// -2147483648 = -1 << 31 = Minimum signed 32-bit int
self::validateValue(-2147483648, 2147483647, $value, "int");
$this->assertOffsetAndLength($offset, 4); $this->assertOffsetAndLength($offset, 4);
$this->writeLittleEndian($offset, 4, $value); $this->writeLittleEndian($offset, 4, $value);
@ -252,7 +254,8 @@ class ByteBuffer
public function putUint($offset, $value) public function putUint($offset, $value)
{ {
// NOTE: We can't put big integer value. this is PHP limitation. // NOTE: We can't put big integer value. this is PHP limitation.
self::validateValue(0, PHP_INT_MAX, $value, "uint", " php has big numbers limitation. check your PHP_INT_MAX"); // 4294967295 = (1 << 32) -1 = Maximum unsigned 32-bin int
self::validateValue(0, 4294967295, $value, "uint", " php has big numbers limitation. check your PHP_INT_MAX");
$this->assertOffsetAndLength($offset, 4); $this->assertOffsetAndLength($offset, 4);
$this->writeLittleEndian($offset, 4, $value); $this->writeLittleEndian($offset, 4, $value);
@ -369,7 +372,11 @@ class ByteBuffer
{ {
$result = $this->readLittleEndian($index, 2); $result = $this->readLittleEndian($index, 2);
return self::convertHelper(self::__SHORT, $result); $sign = $index + (ByteBuffer::isLittleEndian() ? 1 : 0);
$issigned = isset($this->_buffer[$sign]) && ord($this->_buffer[$sign]) & 0x80;
// 65536 = 1 << 16 = Maximum unsigned 16-bit int
return $issigned ? $result - 65536 : $result;
} }
/** /**
@ -389,7 +396,11 @@ class ByteBuffer
{ {
$result = $this->readLittleEndian($index, 4); $result = $this->readLittleEndian($index, 4);
return self::convertHelper(self::__INT, $result); $sign = $index + (ByteBuffer::isLittleEndian() ? 3 : 0);
$issigned = isset($this->_buffer[$sign]) && ord($this->_buffer[$sign]) & 0x80;
// 4294967296 = 1 << 32 = Maximum unsigned 32-bit int
return $issigned ? $result - 4294967296 : $result;
} }
/** /**
@ -407,9 +418,7 @@ class ByteBuffer
*/ */
public function getLong($index) public function getLong($index)
{ {
$result = $this->readLittleEndian($index, 8); return $this->readLittleEndian($index, 8);
return self::convertHelper(self::__LONG, $result);
} }
/** /**
@ -456,22 +465,6 @@ class ByteBuffer
// see also: http://php.net/manual/en/function.pack.php // see also: http://php.net/manual/en/function.pack.php
switch ($type) { switch ($type) {
case self::__SHORT:
$helper = pack("v", $value);
$v = unpack("s", $helper);
return $v[1];
break;
case self::__INT:
$helper = pack("V", $value);
$v = unpack("l", $helper);
return $v[1];
break;
case self::__LONG:
$helper = pack("P", $value);
$v = unpack("q", $helper);
return $v[1];
break;
case self::__FLOAT: case self::__FLOAT:
$inthelper = pack("V", $value); $inthelper = pack("V", $value);
$v = unpack("f", $inthelper); $v = unpack("f", $inthelper);

15
tests/phpTest.php
View File

@ -192,7 +192,7 @@ function fuzzTest1(Assert $assert)
$uchar_val = 0xFF; $uchar_val = 0xFF;
$short_val = -32222; // 0x8222; $short_val = -32222; // 0x8222;
$ushort_val = 0xFEEE; $ushort_val = 0xFEEE;
$int_val = 0x83333333 | 0; $int_val = 0x7fffffff | 0;
// for now // for now
$uint_val = 1; $uint_val = 1;
$long_val = 2; $long_val = 2;
@ -539,6 +539,19 @@ function testByteBuffer(Assert $assert) {
$buffer[7] = chr(0x01); $buffer[7] = chr(0x01);
$uut = Google\FlatBuffers\ByteBuffer::wrap($buffer); $uut = Google\FlatBuffers\ByteBuffer::wrap($buffer);
$assert->Equal(0x010203040A0B0C0D, $uut->getLong(0)); $assert->Equal(0x010203040A0B0C0D, $uut->getLong(0));
//Test: Signed Long
$buffer = str_repeat("\0", 8);
$buffer[0] = chr(0x00);
$buffer[1] = chr(0x00);
$buffer[2] = chr(0x00);
$buffer[3] = chr(0x00);
$buffer[4] = chr(0x00);
$buffer[5] = chr(0x00);
$buffer[6] = chr(0x00);
$buffer[7] = chr(0x80);
$uut = Google\FlatBuffers\ByteBuffer::wrap($buffer);
$assert->Equal(-1 << 63, $uut->getLong(0));
} }
//Test: ByteBuffer_GetLongChecksOffset //Test: ByteBuffer_GetLongChecksOffset