X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Flocale-root.c;h=c1e27bbd7cd49005ff711b0fd1b86ee344139973;hb=refs%2Fheads%2Fsandbox%2FDDTLK%2Fpakage;hp=1d255bf3338acc1a4e577add2fa69ce4fb8a0cf2;hpb=4f7f5ae8e1907b23cb74178dea68790a6fa963fe;p=src%2Fapp-framework-binder.git

diff --git a/src/locale-root.c b/src/locale-root.c
index 1d255bf3..c1e27bbd 100644
--- a/src/locale-root.c
+++ b/src/locale-root.c
@@ -47,7 +47,7 @@ static const char locales[] = "locales/";
 struct locale_folder {
 	struct locale_folder *parent;
 	size_t length;
-	char name[1];
+	char name[];
 };
 
 struct locale_container {
@@ -67,7 +67,7 @@ struct locale_search {
 	struct locale_root *root;
 	struct locale_search_node *head;
 	int refcount;
-	char definition[1];
+	char definition[];
 };
 
 struct locale_root {
@@ -102,7 +102,7 @@ static int add_folder(struct locale_container *container, const char *name)
 	if (folders != NULL) {
 		container->folders = folders;
 		length = strlen(name);
-		folders[count] = malloc(sizeof **folders + length);
+		folders[count] = malloc(sizeof **folders + 1 + length);
 		if (folders[count] != NULL) {
 			folders[count]->parent = NULL;
 			folders[count]->length = length;
@@ -157,7 +157,7 @@ static struct locale_folder *search_folder(struct locale_container *container, c
  */
 static int init_container(struct locale_container *container, int dirfd)
 {
-	int rc, sfd;
+	int rc = 0, sfd;
 	DIR *dir;
 	struct dirent *dent;
 	struct stat st;
@@ -362,7 +362,7 @@ static struct locale_search *create_search(struct locale_root *root, const char
 	struct locale_search_node *node;
 
 	/* allocate the structure */
-	search = malloc(sizeof *search + length);
+	search = malloc(sizeof *search + 1 + length);
 	if (search == NULL) {
 		errno = ENOMEM;
 	} else {