Skip to content

Commit ee247e1

Browse files
janotomkojanotomko
committed
Use g_strfeev instead of virStringFreeList
Both accept a NULL value gracefully and virStringFreeList does not zero the pointer afterwards, so a straight replace is safe. Signed-off-by: Ján Tomko <[email protected]> Reviewed-by: Martin Kletzander <[email protected]>
1 parent 201dcc1 commit ee247e1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+145
-145
lines changed

‎src/bhyve/bhyve_command.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -666,7 +666,7 @@ virAppendBootloaderArgs(virCommandPtr cmd, virDomainDefPtr def)
666666
/* XXX: Handle quoted? */
667667
blargs = virStringSplit(def->os.bootloaderArgs, " ", 0);
668668
virCommandAddArgSet(cmd, (const char * const *)blargs);
669-
virStringListFree(blargs);
669+
g_strfreev(blargs);
670670
}
671671

672672
static virCommandPtr

‎src/bhyve/bhyve_parse_command.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -246,21 +246,21 @@ bhyveCommandLineToArgv(const char *nativeConfig,
246246
} else {
247247
/* To prevent a use-after-free here, only free the argument list
248248
* when it is definitely not going to be used */
249-
virStringListFree(arglist);
249+
g_strfreev(arglist);
250250
}
251251
}
252252

253253
*loader_argv = _loader_argv;
254254
if (!(*bhyve_argv = _bhyve_argv))
255255
goto error;
256256

257-
virStringListFree(lines);
257+
g_strfreev(lines);
258258
return 0;
259259

260260
error:
261261
VIR_FREE(_loader_argv);
262262
VIR_FREE(_bhyve_argv);
263-
virStringListFree(lines);
263+
g_strfreev(lines);
264264
return -1;
265265
}
266266

@@ -884,8 +884,8 @@ bhyveParseCommandLineString(const char* nativeConfig,
884884
}
885885

886886
cleanup:
887-
virStringListFree(loader_argv);
888-
virStringListFree(bhyve_argv);
887+
g_strfreev(loader_argv);
888+
g_strfreev(bhyve_argv);
889889
return def;
890890
error:
891891
virDomainDefFree(def);

‎src/conf/domain_capabilities.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ virDomainCapsCPUModelsDispose(void *obj)
114114

115115
for (i = 0; i < cpuModels->nmodels; i++) {
116116
VIR_FREE(cpuModels->models[i].name);
117-
virStringListFree(cpuModels->models[i].blockers);
117+
g_strfreev(cpuModels->models[i].blockers);
118118
}
119119

120120
VIR_FREE(cpuModels->models);

‎src/conf/node_device_conf.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ virNodeDeviceDefFree(virNodeDeviceDefPtr def)
112112
VIR_FREE(def->sysfs_path);
113113
VIR_FREE(def->parent_sysfs_path);
114114
VIR_FREE(def->devnode);
115-
virStringListFree(def->devlinks);
115+
g_strfreev(def->devlinks);
116116

117117
caps = def->caps;
118118
while (caps) {

‎src/cpu/cpu_arm.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ virCPUarmDataClear(virCPUarmData *data)
124124
if (!data)
125125
return;
126126

127-
virStringListFree(data->features);
127+
g_strfreev(data->features);
128128
}
129129

130130
static void

‎src/cpu/cpu_ppc64.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -801,7 +801,7 @@ virCPUppc64DriverGetModels(char ***models)
801801

802802
error:
803803
if (models) {
804-
virStringListFree(*models);
804+
g_strfreev(*models);
805805
*models = NULL;
806806
}
807807
goto cleanup;

‎src/libxl/libxl_conf.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -1922,7 +1922,7 @@ libxlDriverGetDom0MaxmemConf(libxlDriverConfigPtr cfg,
19221922
goto cleanup;
19231923
}
19241924
}
1925-
virStringListFree(mem_tokens);
1925+
g_strfreev(mem_tokens);
19261926
mem_tokens = NULL;
19271927
}
19281928

@@ -1938,8 +1938,8 @@ libxlDriverGetDom0MaxmemConf(libxlDriverConfigPtr cfg,
19381938
ret = 0;
19391939

19401940
cleanup:
1941-
virStringListFree(cmd_tokens);
1942-
virStringListFree(mem_tokens);
1941+
g_strfreev(cmd_tokens);
1942+
g_strfreev(mem_tokens);
19431943
return ret;
19441944
}
19451945

‎src/libxl/xen_common.c

+6-6
Original file line numberDiff line numberDiff line change
@@ -1061,20 +1061,20 @@ xenParseVifBridge(virDomainNetDefPtr net, char *bridge)
10611061
nvlans++;
10621062

10631063
if (VIR_ALLOC_N(net->vlan.tag, nvlans) < 0) {
1064-
virStringListFree(vlanstr_list);
1064+
g_strfreev(vlanstr_list);
10651065
return -1;
10661066
}
10671067

10681068
for (i = 1; i <= nvlans; i++) {
10691069
if (virStrToLong_ui(vlanstr_list[i], NULL, 10, &tag) < 0) {
1070-
virStringListFree(vlanstr_list);
1070+
g_strfreev(vlanstr_list);
10711071
return -1;
10721072
}
10731073
net->vlan.tag[i - 1] = tag;
10741074
}
10751075
net->vlan.nTags = nvlans;
10761076
net->vlan.trunk = true;
1077-
virStringListFree(vlanstr_list);
1077+
g_strfreev(vlanstr_list);
10781078

10791079
if (VIR_ALLOC(net->virtPortProfile) < 0)
10801080
return -1;
@@ -1270,11 +1270,11 @@ xenParseVif(char *entry, const char *vif_typename)
12701270

12711271
for (i = 0; ip_list[i]; i++) {
12721272
if (virDomainNetAppendIPAddress(net, ip_list[i], 0, 0) < 0) {
1273-
virStringListFree(ip_list);
1273+
g_strfreev(ip_list);
12741274
goto cleanup;
12751275
}
12761276
}
1277-
virStringListFree(ip_list);
1277+
g_strfreev(ip_list);
12781278
}
12791279

12801280
if (script && script[0])
@@ -1679,7 +1679,7 @@ xenMakeIPList(virNetDevIPInfoPtr guestIP)
16791679
ret = virStringListJoin((const char**)address_array, " ");
16801680

16811681
cleanup:
1682-
virStringListFree(address_array);
1682+
g_strfreev(address_array);
16831683
return ret;
16841684
}
16851685

‎src/libxl/xen_xl.c

+6-6
Original file line numberDiff line numberDiff line change
@@ -318,15 +318,15 @@ xenParseXLCPUID(virConfPtr conf, virDomainDefPtr def)
318318
policy) < 0)
319319
goto cleanup;
320320

321-
virStringListFree(name_and_value);
321+
g_strfreev(name_and_value);
322322
name_and_value = NULL;
323323
}
324324

325325
ret = 0;
326326

327327
cleanup:
328-
virStringListFree(name_and_value);
329-
virStringListFree(cpuid_pairs);
328+
g_strfreev(name_and_value);
329+
g_strfreev(cpuid_pairs);
330330
return ret;
331331
}
332332

@@ -528,7 +528,7 @@ xenParseXLVnuma(virConfPtr conf,
528528
VIR_FREE(tmp);
529529
tmp = g_strdup(vtoken);
530530

531-
virStringListFree(token);
531+
g_strfreev(token);
532532
if (!(token = virStringSplitCount(tmp, ",", 0, &ndistances)))
533533
goto cleanup;
534534

@@ -590,7 +590,7 @@ xenParseXLVnuma(virConfPtr conf,
590590
cleanup:
591591
if (ret)
592592
VIR_FREE(cpu);
593-
virStringListFree(token);
593+
g_strfreev(token);
594594
VIR_FREE(tmp);
595595

596596
return ret;
@@ -1402,7 +1402,7 @@ xenFormatXLCPUID(virConfPtr conf, virDomainDefPtr def)
14021402
ret = 0;
14031403

14041404
cleanup:
1405-
virStringListFree(cpuid_pairs);
1405+
g_strfreev(cpuid_pairs);
14061406
VIR_FREE(cpuid_string);
14071407
return ret;
14081408
}

‎src/libxl/xen_xm.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ xenParseXMDiskList(virConfPtr conf, virDomainDefPtr def)
281281
ret = 0;
282282

283283
cleanup:
284-
virStringListFree(disks);
284+
g_strfreev(disks);
285285
return ret;
286286
}
287287

‎src/lxc/lxc_container.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,7 @@ static int lxcContainerUnmountSubtree(const char *prefix,
553553
ret = 0;
554554

555555
cleanup:
556-
virStringListFree(mounts);
556+
g_strfreev(mounts);
557557

558558
return ret;
559559
}

‎src/lxc/lxc_native.c

+10-10
Original file line numberDiff line numberDiff line change
@@ -136,12 +136,12 @@ static char ** lxcStringSplit(const char *string)
136136
result[ntokens - 2] = g_strdup(parts[i]);
137137
}
138138

139-
virStringListFree(parts);
139+
g_strfreev(parts);
140140
return result;
141141

142142
error:
143-
virStringListFree(parts);
144-
virStringListFree(result);
143+
g_strfreev(parts);
144+
g_strfreev(result);
145145
return NULL;
146146
}
147147

@@ -166,13 +166,13 @@ lxcParseFstabLine(char *fstabLine)
166166
fstab->type = g_strdup(parts[2]);
167167
fstab->options = g_strdup(parts[3]);
168168

169-
virStringListFree(parts);
169+
g_strfreev(parts);
170170

171171
return fstab;
172172

173173
error:
174174
lxcFstabFree(fstab);
175-
virStringListFree(parts);
175+
g_strfreev(parts);
176176
return NULL;
177177
}
178178

@@ -312,7 +312,7 @@ lxcAddFstabLine(virDomainDefPtr def, lxcFstabPtr fstab)
312312
ret = 1;
313313

314314
cleanup:
315-
virStringListFree(options);
315+
g_strfreev(options);
316316
return ret;
317317
}
318318

@@ -575,11 +575,11 @@ lxcNetworkParseDataIPs(const char *name,
575575
virReportError(VIR_ERR_INVALID_ARG,
576576
_("Invalid CIDR address: '%s'"), value->str);
577577

578-
virStringListFree(ipparts);
578+
g_strfreev(ipparts);
579579
return -1;
580580
}
581581

582-
virStringListFree(ipparts);
582+
g_strfreev(ipparts);
583583

584584
if (VIR_APPEND_ELEMENT(parseData->ips, parseData->nips, ip) < 0)
585585
return -1;
@@ -1070,7 +1070,7 @@ lxcBlkioDeviceWalkCallback(const char *name, virConfValuePtr value, void *data)
10701070
ret = 0;
10711071

10721072
cleanup:
1073-
virStringListFree(parts);
1073+
g_strfreev(parts);
10741074
return ret;
10751075
}
10761076

@@ -1114,7 +1114,7 @@ lxcSetCapDrop(virDomainDefPtr def, virConfPtr properties)
11141114

11151115
def->features[VIR_DOMAIN_FEATURE_CAPABILITIES] = VIR_DOMAIN_CAPABILITIES_POLICY_ALLOW;
11161116

1117-
virStringListFree(toDrop);
1117+
g_strfreev(toDrop);
11181118
}
11191119

11201120
virDomainDefPtr

‎src/qemu/qemu_agent.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -2165,7 +2165,7 @@ qemuAgentGetInterfaces(qemuAgentPtr agent,
21652165
}
21662166

21672167
/* Has to be freed for each interface. */
2168-
virStringListFree(ifname);
2168+
g_strfreev(ifname);
21692169

21702170
/* as well as IP address which - moreover -
21712171
* can be presented multiple times */
@@ -2251,7 +2251,7 @@ qemuAgentGetInterfaces(qemuAgentPtr agent,
22512251
virDomainInterfaceFree(ifaces_ret[i]);
22522252
}
22532253
VIR_FREE(ifaces_ret);
2254-
virStringListFree(ifname);
2254+
g_strfreev(ifname);
22552255

22562256
goto cleanup;
22572257
}

‎src/qemu/qemu_capabilities.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -3166,7 +3166,7 @@ virQEMUCapsGetCPUFeatures(virQEMUCapsPtr qemuCaps,
31663166
else
31673167
ret = 0;
31683168

3169-
virStringListFree(list);
3169+
g_strfreev(list);
31703170
return ret;
31713171
}
31723172

@@ -3222,7 +3222,7 @@ virQEMUCapsProbeQMPTPM(virQEMUCapsPtr qemuCaps,
32223222
virQEMUCapsTPMModelsToCaps[i].caps);
32233223
}
32243224
}
3225-
virStringListFree(entries);
3225+
g_strfreev(entries);
32263226

32273227
if ((nentries = qemuMonitorGetTPMTypes(mon, &entries)) < 0)
32283228
return -1;
@@ -3235,7 +3235,7 @@ virQEMUCapsProbeQMPTPM(virQEMUCapsPtr qemuCaps,
32353235
virQEMUCapsSet(qemuCaps, virQEMUCapsTPMTypesToCaps[i].caps);
32363236
}
32373237
}
3238-
virStringListFree(entries);
3238+
g_strfreev(entries);
32393239

32403240
return 0;
32413241
}
@@ -3324,7 +3324,7 @@ virQEMUCapsProbeQMPCommandLine(virQEMUCapsPtr qemuCaps,
33243324
break;
33253325
}
33263326
}
3327-
virStringListFree(values);
3327+
g_strfreev(values);
33283328
}
33293329

33303330
return 0;

‎src/qemu/qemu_conf.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ static void virQEMUDriverConfigDispose(void *obj)
300300

301301
virBitmapFree(cfg->namespaces);
302302

303-
virStringListFree(cfg->cgroupDeviceACL);
303+
g_strfreev(cfg->cgroupDeviceACL);
304304
VIR_FREE(cfg->uri);
305305

306306
VIR_FREE(cfg->configBaseDir);
@@ -365,7 +365,7 @@ static void virQEMUDriverConfigDispose(void *obj)
365365
VIR_FREE(cfg->snapshotImageFormat);
366366
VIR_FREE(cfg->autoDumpPath);
367367

368-
virStringListFree(cfg->securityDriverNames);
368+
g_strfreev(cfg->securityDriverNames);
369369

370370
VIR_FREE(cfg->lockManagerName);
371371

@@ -374,7 +374,7 @@ static void virQEMUDriverConfigDispose(void *obj)
374374
VIR_FREE(cfg->memoryBackingDir);
375375
VIR_FREE(cfg->swtpmStorageDir);
376376

377-
virStringListFree(cfg->capabilityfilters);
377+
g_strfreev(cfg->capabilityfilters);
378378
}
379379

380380

0 commit comments

Comments
 (0)