commit 77e5f3a3a37e8819f3a5154d4724ecd102fab587
author lnn1123 <lnn1123killer@gmail.com> Tue May 10 18:44:20 2016 +0800
committer Nobuaki Sukegawa <nsukeg@gmail.com> Sat Aug 20 18:37:53 2016 +0900
tree 15d7b7972c4e5586382ec2638f0164f3a50b246b
parent fd02a30e5874c9b3d4e79f0d32289e74351b3e67

THRIFT-3827 Fix CompactProtocol readI64 function

This closes #1008 and closes #1052

lib/php/lib/Thrift/Protocol/TCompactProtocol.php

diff --git a/lib/php/lib/Thrift/Protocol/TCompactProtocol.php b/lib/php/lib/Thrift/Protocol/TCompactProtocol.php
index 2870351..124f6ec 100644
--- a/lib/php/lib/Thrift/Protocol/TCompactProtocol.php
+++ b/lib/php/lib/Thrift/Protocol/TCompactProtocol.php
@@ -615,7 +615,7 @@
       if ($shift >= 32) {
         $hi |= (($byte & 0x7f) << ($shift - 32));
       } elseif ($shift > 25) {
-        $hi |= (($byte & 0x7f) >> ($shift - 25));
+        $hi |= (($byte & 0x7f) >> ($shift - 24));
       }
       if (($byte >> 7) === 0) {
         break;
@@ -635,7 +635,7 @@
 
     // Now put $hi and $lo back together
     if (true) {
-      $isNeg = $hi  < 0;
+      $isNeg = $hi  < 0 || $hi & 0x80000000;
 
       // Check for a negative
       if ($isNeg) {