proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-08 10:21:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix handling of empty config keys

Browse Source 
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
This commit is contained in:
Stéphane Graber 2014-01-22 17:14:10 -05:00
parent 87b86add6c
commit 2eee1b96c6
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lxc/lxc_info.c
View File

@ -332,7 +332,7 @@ static int print_info(const char *name, const char *lxcpath)
for(i = 0; i < keys; i++) { for(i = 0; i < keys; i++) {
int len = c->get_config_item(c, key[i], NULL, 0); int len = c->get_config_item(c, key[i], NULL, 0);
if (len >= 0) { if (len > 0) {
char *val = (char*) malloc(sizeof(char)*len + 1); char *val = (char*) malloc(sizeof(char)*len + 1);
if (c->get_config_item(c, key[i], val, len + 1) != len) { if (c->get_config_item(c, key[i], val, len + 1) != len) {
@ -341,8 +341,10 @@ static int print_info(const char *name, const char *lxcpath)
printf("%s = %s\n", key[i], val); printf("%s = %s\n", key[i], val);
} }
free(val); free(val);
} else if (len == 0) {
printf("%s =\n", key[i]);
} else { } else {
fprintf(stderr, "%s unset or invalid\n", key[i]); fprintf(stderr, "%s invalid\n", key[i]);
} }
} }

4
src/python-lxc/lxc.c
View File

@ -843,6 +843,10 @@ Container_get_config_item(Container *self, PyObject *args, PyObject *kwds)
return NULL; return NULL;
} }
if (len == 0) {
return PyUnicode_FromString("");
}
char* value = (char*) malloc(sizeof(char)*len + 1); char* value = (char*) malloc(sizeof(char)*len + 1);
if (value == NULL) if (value == NULL)
return PyErr_NoMemory(); return PyErr_NoMemory();