pylibfdt: Update the bytearray size with pack()

At present pack() calls fdt_pack() which may well reduce the size of the device-tree data. However this does not currently update the size of the bytearray to take account of any reduction. This means that there may be unused data at the end of the bytearray and any users of as_bytearray() will see this extra data. Fix this by resizing the bytearray after packing. Signed-off-by: Simon Glass <[email protected]> Signed-off-by: David Gibson <[email protected]>
Ayush1325 · Jun 13, 2018 · 354d3dc · 354d3dc
1 parent 3c374d4
commit 354d3dc
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/pylibfdt/libfdt.i b/pylibfdt/libfdt.i
@@ -474,10 +474,17 @@ class Fdt:
         Args:
             quiet: Errors to ignore (empty to raise on all errors)
 
+        Returns:
+            Error code, or 0 if OK
+
         Raises:
             FdtException if any error occurs
         """
-        return check_err(fdt_pack(self._fdt), quiet)
+        err = check_err(fdt_pack(self._fdt), quiet)
+        if err:
+            return err
+        del self._fdt[self.totalsize():]
+        return err
 
     def getprop(self, nodeoffset, prop_name, quiet=()):
         """Get a property from a node

diff --git a/tests/pylibfdt_tests.py b/tests/pylibfdt_tests.py
@@ -308,6 +308,7 @@ def testPack(self):
         self.assertEquals(orig_size, self.fdt.totalsize())
         self.assertEquals(self.fdt.pack(), 0)
         self.assertTrue(self.fdt.totalsize() < orig_size)
+        self.assertEquals(self.fdt.totalsize(), len(self.fdt.as_bytearray()))
 
     def testBadPropertyOffset(self):
         """Test that bad property offsets are detected"""