shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-04 21:47:16 +03:00
Code Releases Activity

xenxs: Remove PATH_MAX sized stack allocation in XM script parsing

Browse Source
This commit is contained in:
Matthias Bolte 2011-04-03 11:21:21 +02:00
parent 0e27b8a856
commit 1901d091f1
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/xenxs/xen_xm.c
View File

@ -211,6 +211,7 @@ xenParseXM(virConfPtr conf, int xendConfigVersion,
const char *defaultArch, *defaultMachine;
int vmlocaltime = 0;
unsigned long count;
char *script = NULL;
if (VIR_ALLOC(def) < 0) {
virReportOOMError();
@ -556,7 +557,6 @@ xenParseXM(virConfPtr conf, int xendConfigVersion,
if (list && list->type == VIR_CONF_LIST) {
list = list->list;
while (list) {
char script[PATH_MAX];
char model[10];
char type[10];
char ip[16];
@ -567,7 +567,6 @@ xenParseXM(virConfPtr conf, int xendConfigVersion,
bridge[0] = '\0';
mac[0] = '\0';
script[0] = '\0';
ip[0] = '\0';
model[0] = '\0';
type[0] = '\0';
@ -602,12 +601,10 @@ xenParseXM(virConfPtr conf, int xendConfigVersion,
goto skipnic;
}
} else if (STRPREFIX(key, "script=")) {
int len = nextkey ? (nextkey - data) : sizeof(script) - 1;
if (virStrncpy(script, data, len, sizeof(script)) == NULL) {
XENXS_ERROR(VIR_ERR_INTERNAL_ERROR,
_("Script %s too big for destination"),
data);
goto skipnic;
int len = nextkey ? (nextkey - data) : strlen(data);
VIR_FREE(script);
if (!(script = strndup(data, len))) {
goto no_memory;
}
} else if (STRPREFIX(key, "model=")) {
int len = nextkey ? (nextkey - data) : sizeof(model) - 1;
@ -1043,6 +1040,7 @@ cleanup:
virDomainNetDefFree(net);
virDomainDiskDefFree(disk);
virDomainDefFree(def);
VIR_FREE(script);
return NULL;
}