Merge pull request #913 from eslavich/PR-909-2.7.x

PR 909 2.7.x
asdf-format · Jan 15, 2021 · dea60c5 · dea60c5
2 parents 7c98ef7 + 09e1cb8
commit dea60c5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -3,7 +3,7 @@
 
 - Fix bug causing test collection failures in some environments. [#889]
 
-- Fix bug when decompressing arrays with numpy 1.20.  [#901]
+- Fix bug when decompressing arrays with numpy 1.20.  [#901, #909]
 
 2.7.1 (2020-08-18)
 ------------------

diff --git a/asdf/compression.py b/asdf/compression.py
@@ -201,13 +201,11 @@ def decompress(fd, used_size, data_size, compression):
         decoded = decoder.flush()
         if i + len(decoded) > data_size:
             raise ValueError("Decompressed data too long")
-        elif i + len(decoded) < data_size:
-            raise ValueError("Decompressed data too short")
-        # Previous versions of numpy permitted assignment of an
-        # empty bytes object to an empty array range, but starting
-        # with numpy 1.20 this raises an error.
-        elif len(decoded) > 0:
-            buffer[i:i+len(decoded)] = decoded
+        buffer.data[i:i+len(decoded)] = decoded
+        i += len(decoded)
+
+    if i < data_size:
+        raise ValueError("Decompressed data too short")
 
     return buffer