X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwgtpkg-install.c;h=27dcb877c2cf7a94c1c87634414967897bc67ff5;hb=d8d819bcde18c8b4b5dfbdf610a6fc5e04fa54bf;hp=2b57a4ea3bf302462ba49c65875616ba95fbd46a;hpb=c6a0f3884ebb85f6c9b6eec631ac78b6fe27f4f5;p=src%2Fapp-framework-main.git

diff --git a/src/wgtpkg-install.c b/src/wgtpkg-install.c
index 2b57a4e..27dcb87 100644
--- a/src/wgtpkg-install.c
+++ b/src/wgtpkg-install.c
@@ -1,5 +1,5 @@
 /*
- Copyright 2015, 2016, 2017 IoT.bzh
+ Copyright (C) 2015-2018 IoT.bzh
 
  author: José Bollo <jose.bollo@iot.bzh>
 
@@ -168,13 +168,13 @@ static int check_valid_string(const char *value, const char *name)
 	if (c == 0) {
 		ERROR("empty string forbidden in '%s' (temporary constraints)", name);
 		errno = EINVAL;
-		return -1;			
+		return -1;
 	}
 	do {
 		if (!isalnum(c) && !strchr(".-_", c)) {
 			ERROR("forbidden char %c in '%s' -> '%s' (temporary constraints)", c, name, value);
 			errno = EINVAL;
-			return -1;			
+			return -1;
 		}
 		c = value[++pos];
 	} while(c);
@@ -458,7 +458,7 @@ static int install_security(const struct wgt_desc *desc)
 	len--;
 	*head++ = '/';
 	icon = desc->icons ? desc->icons->src : NULL;
-	lic = (unsigned)strlen(icon);
+	lic = (unsigned)(icon ? strlen(icon) : 0);
 	n = file_count();
 	i = 0;
 	while(i < n) {
@@ -517,7 +517,7 @@ struct wgt_info *install_widget(const char *wgtfile, const char *root, int force
 	if (zread(wgtfile, 0))
 		goto error2;
 
-	if (check_all_signatures())
+	if (check_all_signatures(DEFAULT_ALLOW_NO_SIGNATURE))
 		goto error2;
 
 	ifo = wgt_info_createat(workdirfd, NULL, 1, 1, 1);