From 354d3dc55939499954b5e1f4948517da24591cd2 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Wed, 13 Jun 2018 05:38:23 -0600 Subject: 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 Signed-off-by: David Gibson --- pylibfdt/libfdt.i | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'pylibfdt') diff --git a/pylibfdt/libfdt.i b/pylibfdt/libfdt.i index adb4ee8..c0a2191 100644 --- 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 -- cgit v1.1