]> git.ipfire.org Git - people/ms/u-boot.git/commitdiff
tpm: add more missing va_end()
authorAndré Draszik <adraszik@tycoint.com>
Tue, 3 Oct 2017 15:55:54 +0000 (16:55 +0100)
committerSimon Glass <sjg@chromium.org>
Fri, 17 Nov 2017 14:15:52 +0000 (07:15 -0700)
While commit 36d35345b1f6 ("tpm: add missing va_end") added
some missing calls to va_end(), it missed a few places.

Signed-off-by: André Draszik <adraszik@tycoint.com>
Acked-by: Simon Glass <sjg@chromium.org>
lib/tpm.c

index d21bbcfb11d2183bb7d83a51064c99805eab9e36..c8bf06178f17b90ab679e9424ac6441bbd047073 100644 (file)
--- a/lib/tpm.c
+++ b/lib/tpm.c
@@ -92,6 +92,7 @@ int pack_byte_string(uint8_t *str, size_t size, const char *format, ...)
                        break;
                default:
                        debug("Couldn't recognize format string\n");
+                       va_end(args);
                        return -1;
                }
 
@@ -170,8 +171,10 @@ int unpack_byte_string(const uint8_t *str, size_t size, const char *format, ...)
                        return -1;
                }
 
-               if (offset + length > size)
+               if (offset + length > size) {
+                       va_end(args);
                        return -1;
+               }
 
                switch (*format) {
                case 'b':