From 62dd3ea75a1934f39fc0b4253b58444972e2c3a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Thu, 30 Dec 2004 15:53:51 +0000
Subject: [PATCH] Fix some warnings.

---
 ChangeLog                |  3 +++
 libraries/fpdf/ufpdf.php | 30 ++++++++++++++++--------------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 175fccd09..2106b0c5b 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2004-12-30 Michal Čihař  <michal@cihar.com>
+    * libraries/fpdf/ufpdf.php: Fix some warnings.
+
 2004-12-29 Michal Čihař  <michal@cihar.com>
     * libraries/export/sql.php: Fix typo.
     * server_databases.php: Use same sort order as in left frame (bug
diff --git a/libraries/fpdf/ufpdf.php b/libraries/fpdf/ufpdf.php
index 5c72add08..a6fff165e 100644
--- a/libraries/fpdf/ufpdf.php
+++ b/libraries/fpdf/ufpdf.php
@@ -15,7 +15,7 @@ if(!class_exists('UFPDF'))
 {
 define('UFPDF_VERSION','0.1');
 
-include_once 'fpdf.php';
+include_once './libraries/fpdf/fpdf.php';
 
 class UFPDF extends FPDF
 {
@@ -315,23 +315,24 @@ function utf8_to_utf16be(&$txt, $bom = true) {
         while (ord($txt{$i + 1}) >= 0x80 && ord($txt{$i + 1}) < 0xC0) { ++$i; }
         continue;
       }
-      
+
       $q = array($c);
       // Fetch rest of sequence
-      while (ord($txt{$i + 1}) >= 0x80 && ord($txt{$i + 1}) < 0xC0) { ++$i; $q[] = ord($txt{$i}); }
-      
+      $l = strlen($txt);
+      while ($i + 1 < $l && ord($txt{$i + 1}) >= 0x80 && ord($txt{$i + 1}) < 0xC0) { ++$i; $q[] = ord($txt{$i}); }
+
       // Check length
       if (count($q) != $s) {
-        $out .= "\xFF\xFD";        
+        $out .= "\xFF\xFD";
         continue;
       }
-      
+
       switch ($s) {
         case 2:
           $cp = (($q[0] ^ 0xC0) << 6) | ($q[1] ^ 0x80);
           // Overlong sequence
           if ($cp < 0x80) {
-            $out .= "\xFF\xFD";        
+            $out .= "\xFF\xFD";
           }
           else {
             $out .= chr($cp >> 8);
@@ -343,7 +344,7 @@ function utf8_to_utf16be(&$txt, $bom = true) {
           $cp = (($q[0] ^ 0xE0) << 12) | (($q[1] ^ 0x80) << 6) | ($q[2] ^ 0x80);
           // Overlong sequence
           if ($cp < 0x800) {
-            $out .= "\xFF\xFD";        
+            $out .= "\xFF\xFD";
           }
           // Check for UTF-8 encoded surrogates (caused by a bad UTF-8 encoder)
           else if ($c > 0xD800 && $c < 0xDFFF) {
@@ -363,14 +364,14 @@ function utf8_to_utf16be(&$txt, $bom = true) {
           }
           // Outside of the Unicode range
           else if ($cp >= 0x10FFFF) {
-            $out .= "\xFF\xFD";            
+            $out .= "\xFF\xFD";
           }
           else {
             // Use surrogates
             $cp -= 0x10000;
             $s1 = 0xD800 | ($cp >> 10);
             $s2 = 0xDC00 | ($cp & 0x3FF);
-            
+
             $out .= chr($s1 >> 8);
             $out .= chr($s1 & 0xFF);
             $out .= chr($s2 >> 8);
@@ -416,17 +417,18 @@ function utf8_to_codepoints(&$txt) {
         while (ord($txt{$i + 1}) >= 0x80 && ord($txt{$i + 1}) < 0xC0) { ++$i; }
         continue;
       }
-      
+
       $q = array($c);
       // Fetch rest of sequence
-      while (ord($txt{$i + 1}) >= 0x80 && ord($txt{$i + 1}) < 0xC0) { ++$i; $q[] = ord($txt{$i}); }
-      
+      $l = strlen($txt);
+      while ($i + 1 < $l && ord($txt{$i + 1}) >= 0x80 && ord($txt{$i + 1}) < 0xC0) { ++$i; $q[] = ord($txt{$i}); }
+
       // Check length
       if (count($q) != $s) {
         $out[] = 0xFFFD;
         continue;
       }
-      
+
       switch ($s) {
         case 2:
           $cp = (($q[0] ^ 0xC0) << 6) | ($q[1] ^ 0x80);