Fix installation of more than one widget

[src/app-framework-main.git] / src / wgtpkg-install.c

diff --git a/src/wgtpkg-install.c b/src/wgtpkg-install.c
index 264606a..c4e70e3 100644 (file)
--- a/src/wgtpkg-install.c
+++ b/src/wgtpkg-install.c
@@ -56,14 +56,19 @@ static int check_valid_string(const char *value, const char *name)
                return -1;
        pos = 0;
        c = value[pos];
-       while(c) {
+       if (c == 0) {
+               ERROR("empty string forbidden in '%s' (temporary constraints)", name);
+               errno = EINVAL;
+               return -1;                      
+       }
+       do {
                if (!isalnum(c) && !strchr(".-_", c)) {
                        ERROR("forbidden char %c in '%s' -> '%s' (temporary constraints)", c, name, value);
                        errno = EINVAL;
                        return -1;                      
                }
                c = value[++pos];
-       }
+       } while(c);
        return 0;
 }
 
@@ -248,6 +253,7 @@ struct wgt_info *install_widget(const char *wgtfile, const char *root, int force
        if (!ifo)
                goto error2;
 
+       reset_requested_permissions();
        desc = wgt_info_desc(ifo);
        if (check_widget(desc))
                goto error3;