tokenizer: don't go out of bounds when checking for += in words

idank · Sep 28, 2014 · 7e4140f · 7e4140f
1 parent 612e02b
commit 7e4140f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/bashlex/tokenizer.py b/bashlex/tokenizer.py
@@ -977,7 +977,7 @@ def legalvariablechar(x):
                 return i
 
             # XXX general.c 289
-            if c == '+' and value[i+1] == '=':
+            if c == '+' and i + 1 < len(value) and value[i+1] == '=':
                 return i+1
 
             if not legalvariablechar(c):

diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 setup(
     name='bashlex',
-    version='0.2',
+    version='0.3',
     url='https://github.com/idank/bashlex.git',
     license='GPLv3+',
     author='Idan Kamara',

diff --git a/tests/test-tokenizer.py b/tests/test-tokenizer.py
@@ -241,6 +241,17 @@ def test_assignment(self):
                           t(tt.ASSIGNMENT_WORD, 'a=b', [0, 3],
                             flags=set([flags.word.NOSPLIT, flags.word.ASSIGNMENT]))])
 
+        s = 'a+=b'
+        self.assertTokens(s, [
+                          t(tt.ASSIGNMENT_WORD, 'a+=b', [0, 4],
+                            flags=set([flags.word.NOSPLIT, flags.word.ASSIGNMENT]))])
+
+    def test_plus_at_end_of_word(self):
+        s = 'a+ b'
+        self.assertTokens(s, [
+                          t(tt.WORD, 'a+', [0, 2]),
+                          t(tt.WORD, 'b', [3, 4])])
+
     def test_heredoc(self):
         s = 'a <<EOF'
         self.assertTokens(s, [