From: Antoine Pitrou <solipsis@pitrou.net>
Date: Wed, 1 Jul 2009 15:03:38 +0000 (+0000)
Subject: Merged revisions 73747 via svnmerge from
X-Git-Tag: v3.1.1rc1~114
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=53f4ed7da522527768bdcf5f199cdd11701b9c38;p=python

Merged revisions 73747 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r73747 | antoine.pitrou | 2009-07-01 16:53:06 +0200 (mer., 01 juil. 2009) | 3 lines

  Issue #6369: Fix an RLE decompression bug in the binhex module.
........
---

diff --git a/Lib/binhex.py b/Lib/binhex.py
index 1c3f342903..90e59bce73 100644
--- a/Lib/binhex.py
+++ b/Lib/binhex.py
@@ -324,11 +324,11 @@ class _Rledecoderengine:
         mark = len(self.pre_buffer)
         if self.pre_buffer[-3:] == RUNCHAR + b'\0' + RUNCHAR:
             mark = mark - 3
-        elif self.pre_buffer[-1] == RUNCHAR:
+        elif self.pre_buffer[-1:] == RUNCHAR:
             mark = mark - 2
         elif self.pre_buffer[-2:] == RUNCHAR + b'\0':
             mark = mark - 2
-        elif self.pre_buffer[-2] == RUNCHAR:
+        elif self.pre_buffer[-2:-1] == RUNCHAR:
             pass # Decode all
         else:
             mark = mark - 1
diff --git a/Misc/NEWS b/Misc/NEWS
index 0b66254f5e..125a5f0dfb 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -23,6 +23,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #6369: Fix an RLE decompression bug in the binhex module.
+
 - Issue #6344: Fixed a crash of mmap.read() when passed a negative argument.
 
 Build