From: Matteo Nastasi <nastasi@alternativeoutput.it>
Date: Sat, 2 Apr 2011 12:23:30 +0000 (+0200)
Subject: strlen to mb_strlen with ASCII charset to avoid binary string wrong length calculation
X-Git-Tag: 3.5.2^0
X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=commitdiff_plain;h=e4bf569ad33ddc0459769eb1fa1e0113bb83899d;hp=8b4b4acde29b060cdc27ed0dee877ba8b47acaaa;p=brisk.git

strlen to mb_strlen with ASCII charset to avoid binary string wrong length calculation
---

diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index 8b0e8e4..fa53c62 100644
--- a/web/Obj/brisk.phh
+++ b/web/Obj/brisk.phh
@@ -858,7 +858,7 @@ class User {
               break;
           if (($s = fread($fp, 8)) == FALSE)
               break;
-          if (strlen($s) != 8)
+          if (mb_strlen($s, "ASCII") != 8)
               break;
           $arr = unpack('Ls/Li', $s);
           fclose($fp);
@@ -2494,7 +2494,7 @@ class Room {
               break;
           if (($s = fread($fp, 4)) == FALSE)
               break;
-          if (strlen($s) != 4)
+          if (mb_strlen($s, "ASCII") != 4)
               break;
           $arr = unpack('Le', $s);
           if ($arr['e'] > $tm)
diff --git a/web/briskin5/Obj/briskin5.phh b/web/briskin5/Obj/briskin5.phh
index eef465f..718fabd 100644
--- a/web/briskin5/Obj/briskin5.phh
+++ b/web/briskin5/Obj/briskin5.phh
@@ -533,7 +533,7 @@ class Bin5_user extends User {
                 break;
             if (($s = fread($fp, 8)) == FALSE)
                 break;
-            if (strlen($s) != 8)
+            if (mb_strlen($s, "ASCII") != 8)
                 break;
             $arr = unpack('Ls/Li', $s);
             fclose($fp);
@@ -1158,7 +1158,7 @@ class Bin5 {
               break;
           if (($s = fread($fp, 4)) == FALSE)
               break;
-          if (strlen($s) != 4)
+          if (mb_strlen($s, "ASCII") != 4)
               break;
           $arr = unpack('Le', $s);
           if ($arr['e'] > $tm)