[Crosstoolchain-logs] [device-tree-compiler] 24/29: fdtoverlay: Switch from using alloca to malloc

Vagrant Cascadian vagrant at moszumanska.debian.org
Tue Jan 23 06:34:39 UTC 2018


This is an automated email from the git hooks/post-receive script.

vagrant pushed a commit to branch debian/master
in repository device-tree-compiler.

commit a1fe86f380cbae3fb1aea85654d44637dd13d6c3
Author: kevans at FreeBSD.org <kevans at FreeBSD.org>
Date:   Tue Jan 2 21:05:38 2018 -0600

    fdtoverlay: Switch from using alloca to malloc
    
    alloca entails a complicated header situation when using other platforms, where
    some split it out in alloca.h while others include it as a standard part of
    stdlib.h.
    
    The cons don't seem to outweigh the pros, so switch it to malloc.
    
    Signed-off-by: Kyle Evans <kevans at FreeBSD.org>
    Signed-off-by: David Gibson <david at gibson.dropbear.id.au>
---
 fdtoverlay.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fdtoverlay.c b/fdtoverlay.c
index 7f124fc..62a942d 100644
--- a/fdtoverlay.c
+++ b/fdtoverlay.c
@@ -26,7 +26,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <alloca.h>
 #include <inttypes.h>
 
 #include <libfdt.h>
@@ -79,7 +78,7 @@ static int do_fdtoverlay(const char *input_filename,
 	ret = 0;
 
 	/* allocate blob pointer array */
-	ovblob = alloca(sizeof(*ovblob) * argc);
+	ovblob = malloc(sizeof(*ovblob) * argc);
 	memset(ovblob, 0, sizeof(*ovblob) * argc);
 
 	/* read and keep track of the overlay blobs */
@@ -121,6 +120,7 @@ out_err:
 			if (ovblob[i])
 				free(ovblob[i]);
 		}
+		free(ovblob);
 	}
 	free(blob);
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/crosstoolchain/device-tree-compiler.git



More information about the Crosstoolchain-logs mailing list