Commits

Alex Gaynor  committed 89c328e

handle hashing a None rstr, fixes the test I checked in yesterday.

  • Participants
  • Parent commits bf8bf8a

Comments (0)

Files changed (2)

File pypy/rpython/lltypesystem/rstr.py

         # unlike CPython, there is no reason to avoid to return -1
         # but our malloc initializes the memory to zero, so we use zero as the
         # special non-computed-yet value.
+        if not s:
+            return 0
         x = s.hash
         if x == 0:
             x = _hash_string(s.chars)

File pypy/rpython/ootypesystem/rstr.py

         return ootype.oounicode(ch, -1)
 
     def ll_strhash(s):
+        if not s:
+            return 0
         return s.ll_hash()
 
     def ll_strfasthash(s):