On 05/03/2013 08:53 AM, Michal Privoznik wrote: Hmm, you weren't consistent on whether to use () after the macro name... Since most of the references didn't use it, I'd drop the one () you did use. You know, we COULD play games where we allow a NULL src (and in that case silently set dest to NULL, without an OOM message even when report is true), so that it is easier to blindly use src even if it stems from a failure earlier in the function. That is, right now, we have to do: void foo(char *source) { char *copy = NULL; if (source && VIR_STRDUP(copy, source) < 0) goto cleanup; do stuff with copy cleanup: VIR_FREE(copy); } whereas my proposal to drop ATTRIBUTE_NONNULL(2) would let us do the slightly shorter: void foo(char *source) { char *copy; if (VIR_STRDUP(copy, source) < 0) goto cleanup; do stuff with copy cleanup: VIR_FREE(copy); } That is, just because strdup(NULL) crashes with SEGV doesn't mean our function has to; and we could argue that duplicating NULL into NULL without OOM error is useful behavior. Maybe even return -1 for OOM, 0 for duplicating NULL, and 1 for actual duplication (so callers can use <0 vs. <=0 depending on what they care about). But I'm not sure if we need that yet (and it can be done as a separate patch, if we do decide that it simplifies things without the risk of problems). Maybe make it more obvious that you don't pass &src, by having this (and the other three macros) read: @dst: variable to hold result (char*, not char**) s/ino/into/ (here, and below) My findings (other than the suggestion of accepting NULL source, which would be a separate patch anyways) are minor, so I'm okay giving ACK; it might be worth pushing this in now so we can start using it in new code, even while still waiting for the rest of the series to be reviewed. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

On 05/03/2013 08:53 AM, Michal Privoznik wrote: Good sign that our interface is nice, because using it shrinks the code base. Could merge these two 'if' into one, especially since you were doing it elsewhere in this patch, but not essential. One of the few cases where _QUIET is right, since main() is early enough that normal error reporting may not be initialized yet :) Yep, I said I could live with the double OOM for now, and that we'll clean it up when we make our next pass over VIR_ALLOC. Aargh, I promised to work on this, and still haven't gotten around to it. But it's an independent cleanup to make the make_nonnull_ functions not return half-baked objects, so doesn't hold up your patch. ACK. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

On 05/03/2013 08:53 AM, Michal Privoznik wrote: This function was previously silent on error; which means its callers are now reporting an error where they used to be silent (probably GOOD in most cases) or reporting doubled errors (annoying, and worth fixing now while we are looking at it). I'd feel more comfortable if we: 1. fixed this function to report errors on ALL negative exit paths (although for this function, the only other error path is via VIR_ALLOC_N, and I already said I would tolerate delaying that fix that to a later pass, so that we aren't adding churn with virReportOOMError() in this patch just to pull it back out later) 2. check all callers as part of this patch to make sure they: a. are okay with the error being reported b. quit reporting double OOM on failure For this function, all callers in libxl_conf.c, test_driver.c, xen_hypervisor.c were reporting OOM, and need touchup. It's going to be easier to audit that we are avoiding double-error reports if we fix all call sites any time we change function semantics now, compared to blindly converting to VIR_STRDUP now then trying to audit who changed later. Same comments about changed semantics. I've done the audit; this time: esx_driver.c [hmm, that one wasn't even checking for errors, but we are okay letting it report errors, so no change needed], qemu_capabilities.c [another case of going from silent to error report being good], xen_hypervisor.c, vmx2xmltest.c [tests are less important to fix; it changed from silent to reporting, which is okay], xml2vmxtest.c [another test]. So, of the list of five files with callers, I'd expect at least xen_hypervisor.c to be patched. Another case of changing from silent to error-reporting. Callers: libxl_conf.c, xen_hypervisor.c, testutilsqemu.c [testsuite file, so less important; was previously silent but new reporting behavior is okay], testutilsxen.c [another test file] Looks like libxl_conf.c and xen_hypervisor.c are the two files needing a patch to avoid double-OOM The label is now incorrectly named. And looking at that label: no_memory: virCapabilitiesFreeGuest(guest); return NULL; this is another case of changing from silent to error-reporting. Of the callers, I determined that at least: esx_driver.c and lxc_conf.c switch from silent to reporting (good, no change needed), and at least openvz_conf.c and phyp_driver.c now have double-OOM (fix them); I stopped auditing callers here. Ah, we really DO have a case where my proposal in 1/34 of allowing a NULL source would make sense. Again, no_memory is now labeled incorrectly Label name is now wrong; and looking at the label, it is another case of silent->reporting conversion; all callers need audit. wrong label name, another silent->reporting caller audit. Hmm, it might mean splitting this patch into smaller pieces, focusing on one file plus all its fallout, rather than doing one directory but not tracking any fallout. As such, I'm sending my email now in case it helps you start v4 of a split on just capabilities.c, while I review the rest of this patch in another email. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

On 03.05.2013 23:22, Eric Blake wrote: I don't quite agree. In the next serie I will be: 1) turning VIR_ALLOC* and virAsprintf into OOM reporting 2) removing virReportOOMError from everywhere These two steps will effectively cut off double OOM error reporting and move the place where error is reported closer to it's actual origin. So in this concrete example, callers of virCapabilitiesAddHostFeature are: libxl_conf.c:80: libxlBuildCapabilities: does call virReportOOMError (in fact, its parent does) src/test/test_driver.c:175: testBuildCapabilities: does call virReportOOMError xen_hypervisor.c:2293: xenHypervisorBuildCapabilities does call virReportOOMError (in fact, its parent does) After my patches, these wouldn't call virReportOOMError at all. I agree, that the future patches I am talking about will require more inspection if callee reports OOM error on every path, but I would not bother with it for now. I mean, this chunk of code we have here will report OOM error at no cost - compared to your suggestion where I'd have to manually go through every possible callers. Twice. Moreover, I don't think moving from silent -> reporting is no bad at all. The worst case scenario is, users will see one more line in the libvirtd log. The best case scenario is - all forgotten places where we currently don't catch OOM errors, or do it in bad way (remember make_nonnull_domain?) will now report the correct error. Again, at no price. What I really fear about here is, that I don't change semantics. But that's what review is for, isn't it :) Michal

On 05/03/2013 08:53 AM, Michal Privoznik wrote: Reviewed earlier. Part two of the review: Double OOM, but you also have a VIR_ALLOC, so this will be cleaned up in a later pass. Double OOM reporting; I'd just inline 'return -1' here instead of using goto. Yay - clean conversion! You could drop the error label and just inline the return -1. More instances where allowing a NULL source would simplify callers. Drop this double OOM. This one caught my eye, but it looks correct after all. Another case that could be simplified by taking a NULL source. This change is fine, but incomplete. You need to fix virDomainObjListGetInactiveNames a few lines later to quit reporting OOM when it sees data->oom set. double-oom is excusable because of VIR_ALLOC and again Changed from silent to noisy. Only caller appears to be remote_driver.c:remoteDomainBuildEventIOError, where failure is ignored (the event is basically discarded). Ouch - that code has a pre-existing bug - a NULL return here is eventually passed on to virDomainEventQueuePush, which queues up a NULL, and later servicing of the queue will do a NULL deref in virDomainEventDispatchMatchCallback. Looks like we need to fix that, and now's as good a time as any, possibly by fixing virDomainEventStateQueue to ignore a NULL event push, or possibly by fixing remote_driver.c. Changed from silent to noisy. Only caller appears to be qemu_process.c:qemuProcessHandleIOError, but at least this one properly discards the error without trying to queue up NULL. I'm wondering if these two particular functions should use the _QUIET variant, so we aren't polluting the thread-local error object in a case where the caller is fine discarding the error if it could not be created. silent->noisy. I did not audit this one for callers, but suspect it will be similar to IOError events: we probably have a bug in remote_driver.c for trying to queue NULL, and since all callers probably ignore an event object that could not be queued, using _QUIET here may be appropriate. Hmm, a bit more thinking: all events are asynchronous push, rather than synchronous replies to the client's request; which explains why we ignore OOM in creating an event - we aren't under obligation to send a reply. But I'm wondering if we should have code that tries to deliver an OOM event (of course, pre-created at the time the connection is first established, so that actually sending the OOM event doesn't involve any use of malloc), where hitting OOM and discarding any normal event then falls back to trying to fire the OOM event. Then again, OOM is such a rare corner case, and tends to be somewhat persistent as well; once we hit OOM trying to generate an error, we will probably also hit OOM on the next synchronous call from the client, so it won't be too much longer before they learn about it normally, without us having to worry about a special OOM event. So ignore this paragraph if you think I'm over-engineering things. Hmm, we weren't very consistent on which events were already noisy on creation failure. I guess that argues that using _QUIET variants is overkill, because we already have cases where an OOM will set the thread-local error object even if it event is discarded. Technically, *wwpn is already NULL if we get here, so you can drop this second VIR_FREE. double OOM here, but okay because VIR_ALLOC also uses the label. Again, VIR_ALLOC cleanup will cover this case of double oom Hmm, this code was missing oom reporting; but we'll clean that up on the VIR_ALLOC pass. Interesting. But looks correct. The majority of this patch looks reasonable. I already split capabilities.c into a separate review. domain_event.c is the only remaining file out of this lot that might warrant a split into its own patch, if you want to tackle making all event clients deal sanely with consistent semantics on what happens if you hit OOM when trying to report an event (and again, I'm not sure if the sanest is to clear the thread-local error, leave it polluted, or switch to _QUIET variants since we know that all events are best-effort only). -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

On 05/03/2013 08:53 AM, Michal Privoznik wrote: double-oom reporting, will be cleaned up later, so not an issue for this patch. Another case of side effects (j++) inside the macro call. I think we are safe relying on exactly-once expansion of VIR_STRDUP macros, but we ought to push a followup patch that documents (in both HACKING and virstring.h) that the exactly-once semantics are guaranteed for this particular macro as an exception to the more general rule that any ALL_CAPS name is a macro that might mishandle side effects. (For that matter, VIR_ALLOC and VIR_INSERT_ELEMENT also have the same property of exactly-once semantics, and could also use the same documentation guarantee, but VIR_APPEND_ELEMENT double-evaluates its 'count' parameter, unless we rework virInsertElementsN() to take 'at==-1' to mean use '*countptr' as its initial 'at' value.) silent->noisy, but all callers are limited to tests/*, which just fail the test anyway, so no change needed. Another case where not requiring ATTRIBUTE_NONNNULL(2) on VIR_STRDUP would be handy. I think I've convinced myself we should go that route. Maybe it would help if I post a patch showing what I'm thinking? double-oom, but will be cleaned up later double-oom, but will be cleaned up later silent->reporting, but function is static, and all callers already did 'goto no_memory', so this is merely another double-oom that will be cleaned up in your later pass ACK. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

On 07.05.2013 11:15, Michal Privoznik wrote: AAh, I've just noticed (and ACKed) your cleanup patch set. So I'll wait until you push it after which I'll push this one. Michal

On 05/03/2013 08:53 AM, Michal Privoznik wrote: Old code: if string is not NULL, replace it with a copy from the heap... New code: if string is NULL, copy NULL to the heap. Oops. Drop the ! Drop the oom error here. Pre-existing, but I'd have written the second condition as '!*domainName' (which is O(1) regardless of the length of domainName, whereas strlen()<1 is O(n) if the compiler doesn't optimize well) Technically VIR_STRDUP returns -1, not NULL, if you want to touch up this comment. Another argument in favor of allowing a NULL source argument. Old code: if xmlNodeListGetString found nothing, set *value to an empty string... New code: since 'value' is non-NULL, unconditionally return 0 even if *value is still NULL. Oops. Missing a * ACK if you fix the bugs I called out. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

On 05/03/2013 08:53 AM, Michal Privoznik wrote: Could be simplified by allowing a NULL source (and this time, I actually posted that proposal: https://www.redhat.com/archives/libvir-list/2013-May/msg00458.html) ACK. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

On 05/03/2013 08:53 AM, Michal Privoznik wrote: You can pass NULL source arg now :) and again... [Not here, of course] ...and a third time. These can be simplified as well. And this one. And these two. And some more. [this one can't be simplified] Another case for simplification. This is correct, but I wonder if looks any better with fewer ignore_value calls as follows: const char *name; switch (sched_id) { case LIBXL_SCHEDULER_SEDF: name = "sedf"; break; case LIBXL_SCHEDULER_CREDIT: name = "credit"; if (nparams) *nparams = XEN_SCHED_CREDIT_NPARAM; break; ... } ignore_value(VIR_STRDUP(ret, name)); ACK. I'm okay whether you make the simplifications possible for a NULL source argument now or as a followup patch, and didn't spot anything wrong with this patch as-is. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

On 05/03/2013 08:53 AM, Michal Privoznik wrote: Hmm, for the similar patch to libvirtd earlier in the series, you used VIR_STRDUP_QUIET and an explicit VIR_WARN when inside main() on the grounds that it's too early to rely on normal error handling being up. Do we need to do that here as well? Again, a case where immediately calling exit() may eat the error message, compared to VIR_STRDUP_QUIET/VIR_WARN. ACK once you consider that point. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

On 05/03/2013 08:53 AM, Michal Privoznik wrote: You could chain these into one 'if', if desired. ACK. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

On 09.05.2013 10:15, Daniel P. Berrange wrote: Not true unless you compile without -g. If you do copile with -g gdb is actually able to tell you the full stack trace - so you can see the right line within if() statement which caused the trouble. Michal

On 09.05.2013 12:49, Daniel P. Berrange wrote: Aaah. Okay then - I've tested on the latest gcc-4.8.0 and gdb-7.6 which could explain why I don't see the problem. So I will not join the if()'s for now. Neither split those already joined. :) I'll just leave everything as is. Michal

--- src/network/bridge_driver.c | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index e828997..fb01ebf 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -378,8 +378,8 @@ networkStateInitialize(bool privileged, "%s/log/libvirt/qemu", LOCALSTATEDIR) == -1) goto out_of_memory; - if ((base = strdup(SYSCONFDIR "/libvirt")) == NULL) - goto out_of_memory; + if (VIR_STRDUP(base, SYSCONFDIR "/libvirt") < 0) + goto error; } else { char *userdir = virGetUserCacheDirectory(); @@ -2824,9 +2824,8 @@ static int networkConnectListNetworks(virConnectPtr conn, char **const names, in for (i = 0 ; i < driver->networks.count && got < nnames ; i++) { virNetworkObjLock(driver->networks.objs[i]); if (virNetworkObjIsActive(driver->networks.objs[i])) { - if (!(names[got] = strdup(driver->networks.objs[i]->def->name))) { + if (VIR_STRDUP(names[got], driver->networks.objs[i]->def->name) < 0) { virNetworkObjUnlock(driver->networks.objs[i]); - virReportOOMError(); goto cleanup; } got++; @@ -2868,9 +2867,8 @@ static int networkConnectListDefinedNetworks(virConnectPtr conn, char **const na for (i = 0 ; i < driver->networks.count && got < nnames ; i++) { virNetworkObjLock(driver->networks.objs[i]); if (!virNetworkObjIsActive(driver->networks.objs[i])) { - if (!(names[got] = strdup(driver->networks.objs[i]->def->name))) { + if (VIR_STRDUP(names[got], driver->networks.objs[i]->def->name) < 0) { virNetworkObjUnlock(driver->networks.objs[i]); - virReportOOMError(); goto cleanup; } got++; @@ -3499,9 +3497,7 @@ static char *networkGetBridgeName(virNetworkPtr net) { goto cleanup; } - bridge = strdup(network->def->bridge); - if (!bridge) - virReportOOMError(); + ignore_value(VIR_STRDUP(bridge, network->def->bridge)); cleanup: if (network) @@ -3689,13 +3685,9 @@ networkCreateInterfacePool(virNetworkDefPtr netdef) { (netdef->forward.type == VIR_NETWORK_FORWARD_PASSTHROUGH)) { netdef->forward.ifs[ii].type = VIR_NETWORK_FORWARD_HOSTDEV_DEVICE_NETDEV; if (vfname[ii]) { - netdef->forward.ifs[ii].device.dev = strdup(vfname[ii]); - if (!netdef->forward.ifs[ii].device.dev) { - virReportOOMError(); + if (VIR_STRDUP(netdef->forward.ifs[ii].device.dev, vfname[ii]) < 0) goto finish; - } - } - else { + } else { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Direct mode types require interface names")); goto finish; @@ -3838,11 +3830,9 @@ networkAllocateActualDevice(virDomainNetDefPtr iface) } iface->data.network.actual->type = actualType = VIR_DOMAIN_NET_TYPE_BRIDGE; - iface->data.network.actual->data.bridge.brname = strdup(netdef->bridge); - if (!iface->data.network.actual->data.bridge.brname) { - virReportOOMError(); + if (VIR_STRDUP(iface->data.network.actual->data.bridge.brname, + netdef->bridge) < 0) goto error; - } /* merge virtualports from interface, network, and portgroup to * arrive at actual virtualport to use @@ -4059,11 +4049,9 @@ networkAllocateActualDevice(virDomainNetDefPtr iface) netdef->name); goto error; } - iface->data.network.actual->data.direct.linkdev = strdup(dev->device.dev); - if (!iface->data.network.actual->data.direct.linkdev) { - virReportOOMError(); + if (VIR_STRDUP(iface->data.network.actual->data.direct.linkdev, + dev->device.dev) < 0) goto error; - } } } -- 1.8.1.5

--- src/node_device/node_device_driver.c | 33 ++++-------- src/node_device/node_device_hal.c | 13 ++--- src/node_device/node_device_udev.c | 99 ++++++++++-------------------------- 3 files changed, 46 insertions(+), 99 deletions(-) diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index 05dc49c..8a84094 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -89,13 +89,8 @@ static int update_driver_name(virNodeDeviceObjPtr dev) } p = strrchr(devpath, '/'); - if (p) { - dev->def->driver = strdup(p+1); - if (!dev->def->driver) { - virReportOOMError(); - goto cleanup; - } - } + if (p && VIR_STRDUP(dev->def->driver, p+1) < 0) + goto cleanup; ret = 0; cleanup: @@ -162,9 +157,8 @@ nodeListDevices(virConnectPtr conn, virNodeDeviceObjLock(driver->devs.objs[i]); if (cap == NULL || virNodeDeviceHasCap(driver->devs.objs[i], cap)) { - if ((names[ndevs++] = strdup(driver->devs.objs[i]->def->name)) == NULL) { + if (VIR_STRDUP(names[ndevs++], driver->devs.objs[i]->def->name) < 0) { virNodeDeviceObjUnlock(driver->devs.objs[i]); - virReportOOMError(); goto failure; } } @@ -322,9 +316,8 @@ nodeDeviceGetParent(virNodeDevicePtr dev) } if (obj->def->parent) { - ret = strdup(obj->def->parent); - if (!ret) - virReportOOMError(); + if (VIR_STRDUP(ret, obj->def->parent) < 0) + goto cleanup; } else { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("no parent for this device")); @@ -389,11 +382,8 @@ nodeDeviceListCaps(virNodeDevicePtr dev, char **const names, int maxnames) } for (caps = obj->def->caps; caps && ncaps < maxnames; caps = caps->next) { - names[ncaps] = strdup(virNodeDevCapTypeToString(caps->type)); - if (names[ncaps++] == NULL) { - virReportOOMError(); + if (VIR_STRDUP(names[ncaps], virNodeDevCapTypeToString(caps->type)) < 0) goto cleanup; - } } ret = ncaps; @@ -555,19 +545,18 @@ nodeDeviceDestroy(virNodeDevicePtr dev) goto out; } - parent_name = strdup(obj->def->parent); /* virNodeDeviceGetParentHost will cause the device object's lock to be * taken, so we have to dup the parent's name and drop the lock * before calling it. We don't need the reference to the object * any more once we have the parent's name. */ - virNodeDeviceObjUnlock(obj); - obj = NULL; - - if (parent_name == NULL) { - virReportOOMError(); + if (VIR_STRDUP(parent_name, obj->def->parent) < 0) { + virNodeDeviceObjUnlock(obj); + obj = NULL; goto out; } + virNodeDeviceObjUnlock(obj); + obj = NULL; if (virNodeDeviceGetParentHost(&driver->devs, dev->name, diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c index 8c77cc3..1a3b507 100644 --- a/src/node_device/node_device_hal.c +++ b/src/node_device/node_device_hal.c @@ -446,10 +446,10 @@ static void dev_create(const char *udi) virNodeDeviceDefPtr def = NULL; const char *name = hal_name(udi); int rv; - char *privData = strdup(udi); + char *privData; char *devicePath = NULL; - if (!privData) + if (VIR_STRDUP(privData, udi) < 0) return; nodeDeviceLock(driverState); @@ -458,14 +458,15 @@ static void dev_create(const char *udi) if (VIR_ALLOC(def) < 0) goto failure; - if ((def->name = strdup(name)) == NULL) + if (VIR_STRDUP(def->name, name) < 0) goto failure; if (get_str_prop(ctx, udi, "info.parent", &parent_key) == 0) { - def->parent = strdup(hal_name(parent_key)); - VIR_FREE(parent_key); - if (def->parent == NULL) + if (VIR_STRDUP(def->parent, hal_name(parent_key)) < 0) { + VIR_FREE(parent_key); goto failure; + } + VIR_FREE(parent_key); } rv = gather_capabilities(ctx, udi, &def->caps); diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index c3c97d7..7d7718e 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -125,12 +125,10 @@ static int udevGetDeviceProperty(struct udev_device *udev_device, /* If this allocation is changed, the comment at the beginning * of the function must also be changed. */ - *property_value = strdup(udev_value); - if (*property_value == NULL) { + if (VIR_STRDUP(*property_value, udev_value) < 0) { VIR_ERROR(_("Failed to allocate memory for property value for " "property key '%s' on device with sysname '%s'"), property_key, udev_device_get_sysname(udev_device)); - virReportOOMError(); ret = PROPERTY_ERROR; goto out; } @@ -214,12 +212,10 @@ static int udevGetDeviceSysfsAttr(struct udev_device *udev_device, /* If this allocation is changed, the comment at the beginning * of the function must also be changed. */ - *attr_value = strdup(udev_value); - if (*attr_value == NULL) { + if (VIR_STRDUP(*attr_value, udev_value) < 0) { VIR_ERROR(_("Failed to allocate memory for sysfs attribute value for " "sysfs attribute '%s' on device with sysname '%s'"), attr_name, udev_device_get_sysname(udev_device)); - virReportOOMError(); ret = PROPERTY_ERROR; goto out; } @@ -387,21 +383,9 @@ static int udevTranslatePCIIds(unsigned int vendor, NULL, NULL); - if (vendor_name != NULL) { - *vendor_string = strdup(vendor_name); - if (*vendor_string == NULL) { - virReportOOMError(); - goto out; - } - } - - if (device_name != NULL) { - *product_string = strdup(device_name); - if (*product_string == NULL) { - virReportOOMError(); - goto out; - } - } + if ((vendor_name && VIR_STRDUP(*vendor_string, vendor_name) < 0) || + (device_name && VIR_STRDUP(*product_string, device_name) < 0)) + goto out; ret = 0; @@ -691,11 +675,8 @@ static int udevProcessSCSITarget(struct udev_device *device ATTRIBUTE_UNUSED, sysname = udev_device_get_sysname(device); - data->scsi_target.name = strdup(sysname); - if (data->scsi_target.name == NULL) { - virReportOOMError(); + if (VIR_STRDUP(data->scsi_target.name, sysname) < 0) goto out; - } if (udevGenerateDeviceName(device, def, NULL) != 0) { goto out; @@ -718,34 +699,34 @@ static int udevGetSCSIType(virNodeDeviceDefPtr def ATTRIBUTE_UNUSED, switch (type) { case TYPE_DISK: - *typestring = strdup("disk"); + ignore_value(VIR_STRDUP(*typestring, "disk")); break; case TYPE_TAPE: - *typestring = strdup("tape"); + ignore_value(VIR_STRDUP(*typestring, "tape")); break; case TYPE_PROCESSOR: - *typestring = strdup("processor"); + ignore_value(VIR_STRDUP(*typestring, "processor")); break; case TYPE_WORM: - *typestring = strdup("worm"); + ignore_value(VIR_STRDUP(*typestring, "worm")); break; case TYPE_ROM: - *typestring = strdup("cdrom"); + ignore_value(VIR_STRDUP(*typestring, "cdrom")); break; case TYPE_SCANNER: - *typestring = strdup("scanner"); + ignore_value(VIR_STRDUP(*typestring, "scanner")); break; case TYPE_MOD: - *typestring = strdup("mod"); + ignore_value(VIR_STRDUP(*typestring, "mod")); break; case TYPE_MEDIUM_CHANGER: - *typestring = strdup("changer"); + ignore_value(VIR_STRDUP(*typestring, "changer")); break; case TYPE_ENCLOSURE: - *typestring = strdup("enclosure"); + ignore_value(VIR_STRDUP(*typestring, "enclosure")); break; case TYPE_RAID: - *typestring = strdup("raid"); + ignore_value(VIR_STRDUP(*typestring, "raid")); break; case TYPE_NO_LUN: default: @@ -756,7 +737,6 @@ static int udevGetSCSIType(virNodeDeviceDefPtr def ATTRIBUTE_UNUSED, if (*typestring == NULL) { if (foundtype == 1) { ret = -1; - virReportOOMError(); } else { VIR_DEBUG("Failed to find SCSI device type %d for %s", type, def->sysfs_path); @@ -917,11 +897,8 @@ static int udevProcessCDROM(struct udev_device *device, * change it to cdrom to preserve compatibility with earlier * versions of libvirt. */ VIR_FREE(def->caps->data.storage.drive_type); - def->caps->data.storage.drive_type = strdup("cdrom"); - if (def->caps->data.storage.drive_type == NULL) { - virReportOOMError(); + if (VIR_STRDUP(def->caps->data.storage.drive_type, "cdrom") < 0) goto out; - } if ((udevGetIntProperty(device, "ID_CDROM_MEDIA", &tmp_int, 0) == PROPERTY_FOUND)) @@ -996,10 +973,7 @@ static int udevKludgeStorageType(virNodeDeviceDefPtr def) if (STRPREFIX(def->caps->data.storage.block, "/dev/vd")) { /* virtio disk */ - def->caps->data.storage.drive_type = strdup("disk"); - if (def->caps->data.storage.drive_type != NULL) { - ret = 0; - } + ret = VIR_STRDUP(def->caps->data.storage.drive_type, "disk"); } if (ret != 0) { @@ -1043,7 +1017,7 @@ static int udevProcessStorage(struct udev_device *device, VIR_DEBUG("No devnode for '%s'", udev_device_get_devpath(device)); goto out; } - data->storage.block = strdup(devnode); + ignore_value(VIR_STRDUP(data->storage.block, devnode)); if (udevGetStringProperty(device, "ID_BUS", @@ -1083,15 +1057,13 @@ static int udevProcessStorage(struct udev_device *device, &tmp_int, 0) == PROPERTY_FOUND) && (tmp_int == 1)) { - data->storage.drive_type = strdup("floppy"); - if (!data->storage.drive_type) + if (VIR_STRDUP(data->storage.drive_type, "floppy") < 0) goto out; } else if ((udevGetIntProperty(device, "ID_DRIVE_FLASH_SD", &tmp_int, 0) == PROPERTY_FOUND) && (tmp_int == 1)) { - data->storage.drive_type = strdup("sd"); - if (!data->storage.drive_type) + if (VIR_STRDUP(data->storage.drive_type, "sd") < 0) goto out; } else { @@ -1294,32 +1266,20 @@ static int udevSetParent(struct udev_device *device, dev = virNodeDeviceFindBySysfsPath(&driverState->devs, parent_sysfs_path); if (dev != NULL) { - def->parent = strdup(dev->def->name); - virNodeDeviceObjUnlock(dev); - - if (def->parent == NULL) { - virReportOOMError(); + if (VIR_STRDUP(def->parent, dev->def->name) < 0) { goto out; + virNodeDeviceObjUnlock(dev); } + virNodeDeviceObjUnlock(dev); - def->parent_sysfs_path = strdup(parent_sysfs_path); - if (def->parent_sysfs_path == NULL) { - virReportOOMError(); + if (VIR_STRDUP(def->parent_sysfs_path, parent_sysfs_path) < 0) goto out; - } - } } while (def->parent == NULL && parent_device != NULL); - if (def->parent == NULL) { - def->parent = strdup("computer"); - } - - if (def->parent == NULL) { - virReportOOMError(); + if (!def->parent && VIR_STRDUP(def->parent, "computer") < 0) goto out; - } ret = 0; @@ -1339,7 +1299,7 @@ static int udevAddOneDevice(struct udev_device *device) goto out; } - def->sysfs_path = strdup(udev_device_get_syspath(device)); + ignore_value(VIR_STRDUP(def->sysfs_path, udev_device_get_syspath(device))); if (udevGetStringProperty(device, "DRIVER", &def->driver) == PROPERTY_ERROR) { @@ -1617,11 +1577,8 @@ static int udevSetupSystemDev(void) goto out; } - def->name = strdup("computer"); - if (def->name == NULL) { - virReportOOMError(); + if (VIR_STRDUP(def->name, "computer") < 0) goto out; - } if (VIR_ALLOC(def->caps) != 0) { virReportOOMError(); -- 1.8.1.5

--- src/interface/interface_backend_udev.c | 36 +++++++++------------------------- 1 file changed, 9 insertions(+), 27 deletions(-) diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c index 7daad16..7f01fce 100644 --- a/src/interface/interface_backend_udev.c +++ b/src/interface/interface_backend_udev.c @@ -227,14 +227,11 @@ udevListInterfacesByStatus(virConnectPtr conn, path = udev_list_entry_get_name(dev_entry); dev = udev_device_new_from_syspath(udev, path); - names[count] = strdup(udev_device_get_sysname(dev)); - udev_device_unref(dev); - - /* If strdup() failed, we are out of memory */ - if (!names[count]) { - virReportOOMError(); + if (VIR_STRDUP(names[count], udev_device_get_sysname(dev)) < 0) { + udev_device_unref(dev); goto err; } + udev_device_unref(dev); count++; } @@ -751,11 +748,8 @@ udevGetIfaceDefBond(struct udev *udev, _("Could not retrieve 'bonding/arp_ip_target' for '%s'"), name); goto cleanup; } - ifacedef->data.bond.target = strdup(tmp_str); - if (!ifacedef->data.bond.target) { - virReportOOMError(); + if (VIR_STRDUP(ifacedef->data.bond.target, tmp_str) < 0) goto cleanup; - } /* Slaves of the bond */ /* Get each slave in the bond */ @@ -839,11 +833,8 @@ udevGetIfaceDefBridge(struct udev *udev, goto error; } - ifacedef->data.bridge.delay = strdup(tmp_str); - if (!ifacedef->data.bridge.delay) { - virReportOOMError(); + if (VIR_STRDUP(ifacedef->data.bridge.delay, tmp_str) < 0) goto error; - } /* Retrieve Spanning Tree State. Valid values = -1, 0, 1 */ tmp_str = udev_device_get_sysattr_value(dev, "bridge/stp_state"); @@ -938,11 +929,8 @@ udevGetIfaceDefVlan(struct udev *udev ATTRIBUTE_UNUSED, char *vid; char *vlan_parent_dev = NULL; - vlan_parent_dev = strdup(name); - if (!vlan_parent_dev) { - virReportOOMError(); + if (VIR_STRDUP(vlan_parent_dev, name) < 0) goto cleanup; - } /* Find the DEVICE.VID again */ vid = strrchr(vlan_parent_dev, '.'); @@ -987,12 +975,8 @@ udevGetIfaceDef(struct udev *udev, const char *name) /* Clear our structure and set safe defaults */ ifacedef->startmode = VIR_INTERFACE_START_UNSPECIFIED; - ifacedef->name = strdup(name); - - if (!ifacedef->name) { - virReportOOMError(); + if (VIR_STRDUP(ifacedef->name, name) < 0) goto cleanup; - } /* Lookup the device we've been asked about */ dev = udev_device_new_from_subsystem_sysname(udev, "net", name); @@ -1003,11 +987,9 @@ udevGetIfaceDef(struct udev *udev, const char *name) } /* MAC address */ - ifacedef->mac = strdup(udev_device_get_sysattr_value(dev, "address")); - if (!ifacedef->mac) { - virReportOOMError(); + if (VIR_STRDUP(ifacedef->mac, + udev_device_get_sysattr_value(dev, "address")) < 0) goto cleanup; - } /* MTU */ mtu_str = udev_device_get_sysattr_value(dev, "mtu"); -- 1.8.1.5

--- src/nwfilter/nwfilter_dhcpsnoop.c | 22 +++++++++++----------- src/nwfilter/nwfilter_driver.c | 7 +++---- src/nwfilter/nwfilter_ebiptables_driver.c | 2 +- src/nwfilter/nwfilter_gentech_driver.c | 5 ++--- src/nwfilter/nwfilter_learnipaddr.c | 5 +---- 5 files changed, 18 insertions(+), 23 deletions(-) diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c index 50042df..a3e05a1 100644 --- a/src/nwfilter/nwfilter_dhcpsnoop.c +++ b/src/nwfilter/nwfilter_dhcpsnoop.c @@ -133,11 +133,11 @@ struct _virNWFilterSnoopReq { virNWFilterTechDriverPtr techdriver; char *ifname; int ifindex; - const char *linkdev; + char *linkdev; enum virDomainNetType nettype; char ifkey[VIR_IFKEY_LEN]; virMacAddr macaddr; - const char *filtername; + char *filtername; virNWFilterHashTablePtr vars; virNWFilterDriverStatePtr driver; /* start and end of lease list, ordered by lease time */ @@ -1110,10 +1110,8 @@ virNWFilterSnoopDHCPOpen(const char *ifname, virMacAddr *mac, * generate much more traffic than if we filtered by VM and * braodcast MAC as well */ - if (!(ext_filter = strdup(filter))) { - virReportOOMError(); + if (VIR_STRDUP(ext_filter, filter) < 0) return NULL; - } } handle = pcap_create(ifname, pcap_errbuf); @@ -1408,7 +1406,7 @@ virNWFilterDHCPSnoopThread(void *req0) fds[i].fd = pcap_fileno(pcapConf[i].handle); } tmp = virNetDevGetIndex(req->ifname, &ifindex); - threadkey = strdup(req->threadkey); + ignore_value(VIR_STRDUP(threadkey, req->threadkey)); worker = virThreadPoolNew(1, 1, 0, virNWFilterDHCPDecodeWorker, req); @@ -1631,15 +1629,17 @@ virNWFilterDHCPSnoopReq(virNWFilterTechDriverPtr techdriver, req->driver = driver; req->techdriver = techdriver; tmp = virNetDevGetIndex(ifname, &req->ifindex); - req->linkdev = linkdev ? strdup(linkdev) : NULL; req->nettype = nettype; - req->ifname = strdup(ifname); virMacAddrSet(&req->macaddr, macaddr); - req->filtername = strdup(filtername); req->vars = virNWFilterHashTableCreate(0); + req->linkdev = NULL; + + if (VIR_STRDUP(req->ifname, ifname) < 0 || + VIR_STRDUP(req->filtername, filtername) < 0 || + (linkdev && VIR_STRDUP(req->linkdev, linkdev) < 0)) + goto exit_snoopreqput; - if (!req->ifname || !req->filtername || !req->vars || tmp < 0 || - (linkdev != NULL && req->linkdev == NULL)) { + if (!req->vars || tmp < 0) { virReportOOMError(); goto exit_snoopreqput; } diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index 7eec3de..64ea251 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -221,8 +221,8 @@ nwfilterStateInitialize(bool privileged, goto error; } - if ((base = strdup(SYSCONFDIR "/libvirt")) == NULL) - goto out_of_memory; + if (VIR_STRDUP(base, SYSCONFDIR "/libvirt") < 0) + goto error; if (virAsprintf(&driverState->configDir, "%s/nwfilter", base) == -1) @@ -454,9 +454,8 @@ nwfilterConnectListNWFilters(virConnectPtr conn, nwfilterDriverLock(driver); for (i = 0 ; i < driver->nwfilters.count && got < nnames ; i++) { virNWFilterObjLock(driver->nwfilters.objs[i]); - if (!(names[got] = strdup(driver->nwfilters.objs[i]->def->name))) { + if (VIR_STRDUP(names[got], driver->nwfilters.objs[i]->def->name) < 0) { virNWFilterObjUnlock(driver->nwfilters.objs[i]); - virReportOOMError(); goto cleanup; } got++; diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c index ac94355..b772847 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -2982,7 +2982,7 @@ ebtablesCreateTmpSubChain(ebiptablesRuleInstPtr *inst, switch (protoidx) { case L2_PROTO_MAC_IDX: - protostr = strdup(""); + ignore_value(VIR_STRDUP_QUIET(protostr, "")); break; case L2_PROTO_STP_IDX: ignore_value(virAsprintf(&protostr, "-d " NWFILTER_MAC_BGA " ")); diff --git a/src/nwfilter/nwfilter_gentech_driver.c b/src/nwfilter/nwfilter_gentech_driver.c index 958f47a..7bca2f4 100644 --- a/src/nwfilter/nwfilter_gentech_driver.c +++ b/src/nwfilter/nwfilter_gentech_driver.c @@ -37,6 +37,7 @@ #include "nwfilter_learnipaddr.h" #include "virnetdev.h" #include "datatypes.h" +#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_NWFILTER @@ -866,9 +867,7 @@ __virNWFilterInstantiateFilter(const unsigned char *vmuuid, } virMacAddrFormat(macaddr, vmmacaddr); - str_macaddr = strdup(vmmacaddr); - if (!str_macaddr) { - virReportOOMError(); + if (VIR_STRDUP(str_macaddr, vmmacaddr) < 0) { rc = -1; goto err_exit; } diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_learnipaddr.c index 14fd32c..f50a246 100644 --- a/src/nwfilter/nwfilter_learnipaddr.c +++ b/src/nwfilter/nwfilter_learnipaddr.c @@ -705,11 +705,8 @@ virNWFilterLearnIPAddress(virNWFilterTechDriverPtr techdriver, if (virNWFilterHashTablePutAll(filterparams, ht) < 0) goto err_free_ht; - req->filtername = strdup(filtername); - if (req->filtername == NULL) { - virReportOOMError(); + if (VIR_STRDUP(req->filtername, filtername) < 0) goto err_free_ht; - } if (virStrcpyStatic(req->ifname, ifname) == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, -- 1.8.1.5

--- src/openvz/openvz_conf.c | 45 ++++++++++++++++++++++----------------------- src/openvz/openvz_driver.c | 39 +++++++++++++++------------------------ 2 files changed, 37 insertions(+), 47 deletions(-) diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index 49fae28..1d401fc 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -135,12 +135,10 @@ openvzParseBarrierLimit(const char* value, { char *token; char *saveptr = NULL; - char *str = strdup(value); + char *str; - if (str == NULL) { - virReportOOMError(); + if (VIR_STRDUP(str, value) < 0) goto error; - } token = strtok_r(str, ":", &saveptr); if (token == NULL) { @@ -230,10 +228,8 @@ openvzReadNetworkConf(virDomainDefPtr def, goto no_memory; net->type = VIR_DOMAIN_NET_TYPE_ETHERNET; - net->data.ethernet.ipaddr = strdup(token); - - if (net->data.ethernet.ipaddr == NULL) - goto no_memory; + if (VIR_STRDUP(net->data.ethernet.ipaddr, token) < 0) + goto error; if (VIR_REALLOC_N(def->nets, def->nnets + 1) < 0) goto no_memory; @@ -405,7 +401,8 @@ openvzReadFSConf(virDomainDefPtr def, goto no_memory; fs->type = VIR_DOMAIN_FS_TYPE_TEMPLATE; - fs->src = strdup(temp); + if (VIR_STRDUP(fs->src, temp) < 0) + goto error; } else { /* OSTEMPLATE was not found, VE was booted from a private dir directly */ ret = openvzReadVPSConfigParam(veid, "VE_PRIVATE", &temp); @@ -423,12 +420,14 @@ openvzReadFSConf(virDomainDefPtr def, goto no_memory; fs->type = VIR_DOMAIN_FS_TYPE_MOUNT; - fs->src = openvz_replace(temp, "$VEID", veid_str); + if (!(fs->src = openvz_replace(temp, "$VEID", veid_str))) + goto no_memory; VIR_FREE(veid_str); } - fs->dst = strdup("/"); + if (VIR_STRDUP(fs->dst, "/") < 0) + goto error; param = "DISKSPACE"; ret = openvzReadVPSConfigParam(veid, param, &temp); @@ -451,9 +450,6 @@ openvzReadFSConf(virDomainDefPtr def, } } - if (fs->src == NULL || fs->dst == NULL) - goto no_memory; - if (VIR_REALLOC_N(def->fss, def->nfss + 1) < 0) goto no_memory; def->fss[def->nfss++] = fs; @@ -607,10 +603,10 @@ int openvzLoadDomains(struct openvz_driver *driver) { goto cleanup; } - if (!(def->os.type = strdup("exe"))) - goto no_memory; - if (!(def->os.init = strdup("/sbin/init"))) - goto no_memory; + if (VIR_STRDUP(def->os.type, "exe") < 0) + goto cleanup; + if (VIR_STRDUP(def->os.init, "/sbin/init") < 0) + goto cleanup; ret = openvzReadVPSConfigParam(veid, "CPUS", &temp); if (ret < 0) { @@ -800,8 +796,7 @@ openvzReadConfigParam(const char *conf_file, const char *param, char **value) saveptr = NULL; if ((token = strtok_r(sf, "\"\t\n", &saveptr)) != NULL) { VIR_FREE(*value); - *value = strdup(token); - if (*value == NULL) { + if (VIR_STRDUP(*value, token) < 0) { err = 1; break; } @@ -952,14 +947,18 @@ openvzLocateConfDir(void) { const char *conf_dir_list[] = {"/etc/vz/conf", "/usr/local/etc/conf", NULL}; int i=0; + char *ret = NULL; while (conf_dir_list[i]) { - if (!access(conf_dir_list[i], F_OK)) - return strdup(conf_dir_list[i]); + if (!access(conf_dir_list[i], F_OK)) { + ignore_value(VIR_STRDUP(ret, conf_dir_list[i])); + goto cleanup; + } i++; } - return NULL; +cleanup: + return ret; } /* Richard Steven's classic readline() function */ diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index e6d7146..65b1163 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -88,7 +88,7 @@ static void openvzDriverUnlock(struct openvz_driver *driver) struct openvz_driver ovz_driver; -static void cmdExecFree(const char *cmdExec[]) +static void cmdExecFree(char *cmdExec[]) { int i=-1; while (cmdExec[++i]) { @@ -103,13 +103,8 @@ openvzDomainDefPostParse(virDomainDefPtr def, void *opaque ATTRIBUTE_UNUSED) { /* fill the init path */ - if (STREQ(def->os.type, "exe") && !def->os.init) { - if (!(def->os.init = strdup("/sbin/init"))) { - virReportOOMError(); - return -1; - } - } - + if (STREQ(def->os.type, "exe") && !def->os.init) + return VIR_STRDUP(def->os.init, "/sbin/init"); return 0; } @@ -358,8 +353,7 @@ static char *openvzDomainGetOSType(virDomainPtr dom) goto cleanup; } - if (!(ret = strdup(vm->def->os.type))) - virReportOOMError(); + ignore_value(VIR_STRDUP(ret, vm->def->os.type)); cleanup: if (vm) @@ -772,12 +766,14 @@ openvzGenerateVethName(int veid, char *dev_name_ve) { char dev_name[32]; int ifNo = 0; + char *ret; if (sscanf(dev_name_ve, "%*[^0-9]%d", &ifNo) != 1) return NULL; if (snprintf(dev_name, sizeof(dev_name), "veth%d.%d", veid, ifNo) < 7) return NULL; - return strdup(dev_name); + ignore_value(VIR_STRDUP(ret, dev_name)); + return ret; } static char * @@ -788,7 +784,7 @@ openvzGenerateContainerVethName(int veid) /* try to get line "^NETIF=..." from config */ if (openvzReadVPSConfigParam(veid, "NETIF", &temp) <= 0) { - name = strdup("eth0"); + ignore_value(VIR_STRDUP(name, "eth0")); } else { char *saveptr = NULL; char *s; @@ -803,15 +799,12 @@ openvzGenerateContainerVethName(int veid) } /* set new name */ - ignore_value(virAsprintf(&name, "eth%d", max + 1)); + if (virAsprintf(&name, "eth%d", max + 1) < 0) + virReportOOMError(); } VIR_FREE(temp); - if (name == NULL) { - virReportOOMError(); - } - return name; } @@ -821,7 +814,7 @@ openvzDomainSetNetwork(virConnectPtr conn, const char *vpsid, virBufferPtr configBuf) { int rc = 0, narg; - const char *prog[OPENVZ_MAX_ARG]; + char *prog[OPENVZ_MAX_ARG]; char macaddr[VIR_MAC_STRING_BUFLEN]; virMacAddr host_mac; char host_macaddr[VIR_MAC_STRING_BUFLEN]; @@ -830,9 +823,9 @@ openvzDomainSetNetwork(virConnectPtr conn, const char *vpsid, #define ADD_ARG_LIT(thisarg) \ do { \ - if (narg >= OPENVZ_MAX_ARG) \ + if (narg >= OPENVZ_MAX_ARG) \ goto no_memory; \ - if ((prog[narg++] = strdup(thisarg)) == NULL) \ + if (VIR_STRDUP(prog[narg++], thisarg) < 0) \ goto no_memory; \ } while (0) @@ -928,7 +921,7 @@ openvzDomainSetNetwork(virConnectPtr conn, const char *vpsid, if (prog[0] != NULL) { ADD_ARG_LIT("--save"); - if (virRun(prog, NULL) < 0) { + if (virRun((const char **)prog, NULL) < 0) { rc = -1; goto exit; } @@ -1642,10 +1635,8 @@ static int openvzConnectListDefinedDomains(virConnectPtr conn ATTRIBUTE_UNUSED, continue; } snprintf(vpsname, sizeof(vpsname), "%d", veid); - if (!(names[got] = strdup(vpsname))) { - virReportOOMError(); + if (VIR_STRDUP(names[got], vpsname) < 0) goto out; - } got ++; } -- 1.8.1.5

--- src/parallels/parallels_driver.c | 71 +++++++++++++++++---------------------- src/parallels/parallels_network.c | 23 +++++-------- src/parallels/parallels_storage.c | 62 +++++++++++----------------------- 3 files changed, 58 insertions(+), 98 deletions(-) diff --git a/src/parallels/parallels_driver.c b/src/parallels/parallels_driver.c index c29a5ba..eec315d 100644 --- a/src/parallels/parallels_driver.c +++ b/src/parallels/parallels_driver.c @@ -186,8 +186,8 @@ parallelsGetSerialInfo(virDomainChrDefPtr chr, return -1; } - if (!(chr->source.data.file.path = strdup(tmp))) - goto no_memory; + if (VIR_STRDUP(chr->source.data.file.path, tmp) < 0) + goto error; } else if (virJSONValueObjectHasKey(value, "socket")) { chr->source.type = VIR_DOMAIN_CHR_TYPE_UNIX; @@ -197,8 +197,8 @@ parallelsGetSerialInfo(virDomainChrDefPtr chr, return -1; } - if (!(chr->source.data.nix.path = strdup(tmp))) - goto no_memory; + if (VIR_STRDUP(chr->source.data.nix.path, tmp) < 0) + goto error; chr->source.data.nix.listen = false; } else if (virJSONValueObjectHasKey(value, "real")) { chr->source.type = VIR_DOMAIN_CHR_TYPE_DEV; @@ -209,8 +209,8 @@ parallelsGetSerialInfo(virDomainChrDefPtr chr, return -1; } - if (!(chr->source.data.file.path = strdup(tmp))) - goto no_memory; + if (VIR_STRDUP(chr->source.data.file.path, tmp) < 0) + goto error; } else { parallelsParseError(); return -1; @@ -218,8 +218,7 @@ parallelsGetSerialInfo(virDomainChrDefPtr chr, return 0; - no_memory: - virReportOOMError(); +error: return -1; } @@ -318,10 +317,8 @@ parallelsGetHddInfo(virDomainDefPtr def, return -1; } - if (!(disk->src = strdup(tmp))) { - virReportOOMError(); + if (VIR_STRDUP(disk->src, tmp) < 0) return -1; - } } else { disk->type = VIR_DOMAIN_DISK_TYPE_FILE; @@ -330,10 +327,8 @@ parallelsGetHddInfo(virDomainDefPtr def, return -1; } - if (!(disk->src = strdup(tmp))) { - virReportOOMError(); + if (VIR_STRDUP(disk->src, tmp) < 0) return -1; - } } tmp = virJSONValueObjectGetString(value, "port"); @@ -454,10 +449,8 @@ parallelsGetNetInfo(virDomainNetDefPtr net, /* use device name, shown by prlctl as target device * for identifying network adapter in virDomainDefineXML */ - if (!(net->ifname = strdup(key))) { - virReportOOMError(); + if (VIR_STRDUP(net->ifname, key) < 0) goto error; - } net->type = VIR_DOMAIN_NET_TYPE_NETWORK; @@ -478,10 +471,8 @@ parallelsGetNetInfo(virDomainNetDefPtr net, goto error; } - if (!(net->data.network.name = strdup(tmp))) { - virReportOOMError(); + if (VIR_STRDUP(net->data.network.name, tmp) < 0) goto error; - } } else if (virJSONValueObjectHasKey(value, "type")) { if (!(tmp = virJSONValueObjectGetString(value, "type"))) { parallelsParseError(); @@ -493,10 +484,9 @@ parallelsGetNetInfo(virDomainNetDefPtr net, goto error; } - if (!(net->data.network.name = strdup(PARALLELS_ROUTED_NETWORK_NAME))) { - virReportOOMError(); + if (VIR_STRDUP(net->data.network.name, + PARALLELS_ROUTED_NETWORK_NAME) < 0) goto error; - } } else { parallelsParseError(); goto error; @@ -641,8 +631,8 @@ parallelsAddVNCInfo(virDomainDefPtr def, virJSONValuePtr jobj_root) gr->nListens = 1; - if (!(gr->listens[0].address = strdup(tmp))) - goto no_memory; + if (VIR_STRDUP(gr->listens[0].address, tmp) < 0) + goto cleanup; gr->listens[0].type = VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS; @@ -686,8 +676,8 @@ parallelsLoadDomain(parallelsConnPtr privconn, virJSONValuePtr jobj) parallelsParseError(); goto cleanup; } - if (!(def->name = strdup(tmp))) - goto no_memory; + if (VIR_STRDUP(def->name, tmp) < 0) + goto cleanup; if (!(tmp = virJSONValueObjectGetString(jobj, "ID"))) { parallelsParseError(); @@ -704,8 +694,8 @@ parallelsLoadDomain(parallelsConnPtr privconn, virJSONValuePtr jobj) parallelsParseError(); goto cleanup; } - if (!(def->description = strdup(tmp))) - goto no_memory; + if (VIR_STRDUP(def->description, tmp) < 0) + goto cleanup; if (!(jobj2 = virJSONValueObjectGet(jobj, "Hardware"))) { parallelsParseError(); @@ -771,13 +761,13 @@ parallelsLoadDomain(parallelsConnPtr privconn, virJSONValuePtr jobj) } if (STREQ(tmp, "CT")) { - if (!(def->os.type = strdup("exe"))) - goto no_memory; - if (!(def->os.init = strdup("/sbin/init"))) - goto no_memory; + if (VIR_STRDUP(def->os.type, "exe") < 0) + goto cleanup; + if (VIR_STRDUP(def->os.init, "/sbin/init") < 0) + goto cleanup; } else if (STREQ(tmp, "VM")) { - if (!(def->os.type = strdup("hvm"))) - goto no_memory; + if (VIR_STRDUP(def->os.type, "hvm") < 0) + goto cleanup; } def->os.arch = VIR_ARCH_X86_64; @@ -792,16 +782,16 @@ parallelsLoadDomain(parallelsConnPtr privconn, virJSONValuePtr jobj) parallelsParseError(); goto cleanup; } - if (!(pdom->uuid = strdup(tmp))) - goto no_memory; + if (VIR_STRDUP(pdom->uuid, tmp) < 0) + goto cleanup; if (!(tmp = virJSONValueObjectGetString(jobj, "Home"))) { parallelsParseError(); goto cleanup; } - if (!(pdom->home = strdup(tmp))) - goto no_memory; + if (VIR_STRDUP(pdom->home, tmp) < 0) + goto cleanup; if (!(state = virJSONValueObjectGetString(jobj, "State"))) { parallelsParseError(); @@ -1239,8 +1229,7 @@ parallelsDomainGetOSType(virDomainPtr domain) goto cleanup; } - if (!(ret = strdup(privdom->def->os.type))) - virReportOOMError(); + ignore_value(VIR_STRDUP(ret, privdom->def->os.type)); cleanup: if (privdom) diff --git a/src/parallels/parallels_network.c b/src/parallels/parallels_network.c index 23109d3..2e5523b 100644 --- a/src/parallels/parallels_network.c +++ b/src/parallels/parallels_network.c @@ -66,10 +66,8 @@ static int parallelsGetBridgedNetInfo(virNetworkDefPtr def, virJSONValuePtr jobj goto cleanup; } - if (!(def->bridge = strdup(last_component(bridgePath)))) { - virReportOOMError(); + if (VIR_STRDUP(def->bridge, last_component(bridgePath)) < 0) goto cleanup; - } if (virAsprintf(&bridgeAddressPath, "%s/%s/brport/bridge/address", SYSFS_NET_DIR, ifname) < 0) { @@ -130,10 +128,9 @@ static int parallelsGetHostOnlyNetInfo(virNetworkDefPtr def, const char *name) goto cleanup; } - if (!(def->ips[0].family = strdup("ipv4"))) { - virReportOOMError(); + if (VIR_STRDUP(def->ips[0].family, "ipv4") < 0) goto cleanup; - }; + if (!(tmp = virJSONValueObjectGetString(jobj2, "IP address"))) { parallelsParseError(); goto cleanup; @@ -207,8 +204,8 @@ parallelsLoadNetwork(parallelsConnPtr privconn, virJSONValuePtr jobj) goto cleanup; } - if (!(def->name = strdup(tmp))) - goto no_memory; + if (VIR_STRDUP(def->name, tmp) < 0) + goto cleanup; /* Network names are unique in Parallels Cloud Server, so we can make * an UUID from it */ @@ -264,8 +261,8 @@ parallelsAddRoutedNetwork(parallelsConnPtr privconn) def->forward.type = VIR_NETWORK_FORWARD_ROUTE; - if (!(def->name = strdup(PARALLELS_ROUTED_NETWORK_NAME))) - goto no_memory; + if (VIR_STRDUP(def->name, PARALLELS_ROUTED_NETWORK_NAME) < 0) + goto cleanup; if (virUUIDParse(PARALLELS_ROUTED_NETWORK_UUID, def->uuid) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -390,9 +387,8 @@ static int parallelsConnectListNetworks(virConnectPtr conn, for (i = 0 ; i < privconn->networks.count && got < nnames ; i++) { virNetworkObjLock(privconn->networks.objs[i]); if (virNetworkObjIsActive(privconn->networks.objs[i])) { - if (!(names[got] = strdup(privconn->networks.objs[i]->def->name))) { + if (VIR_STRDUP(names[got], privconn->networks.objs[i]->def->name) < 0) { virNetworkObjUnlock(privconn->networks.objs[i]); - virReportOOMError(); goto cleanup; } got++; @@ -438,9 +434,8 @@ static int parallelsConnectListDefinedNetworks(virConnectPtr conn, for (i = 0 ; i < privconn->networks.count && got < nnames ; i++) { virNetworkObjLock(privconn->networks.objs[i]); if (!virNetworkObjIsActive(privconn->networks.objs[i])) { - if (!(names[got] = strdup(privconn->networks.objs[i]->def->name))) { + if (VIR_STRDUP(names[got], privconn->networks.objs[i]->def->name) < 0) { virNetworkObjUnlock(privconn->networks.objs[i]); - virReportOOMError(); goto cleanup; } got++; diff --git a/src/parallels/parallels_storage.c b/src/parallels/parallels_storage.c index 4c98e43..3123e29 100644 --- a/src/parallels/parallels_storage.c +++ b/src/parallels/parallels_storage.c @@ -136,20 +136,9 @@ static char *parallelsMakePoolName(virConnectPtr conn, const char *path) bool found = false; int j; - if (!(name = strdup(path))) { - virReportOOMError(); - return NULL; - } - - if (i == 0) - name = strdup(path); - else - ignore_value(virAsprintf(&name, "%s-%u", path, i)); - - if (!name) { - virReportOOMError(); + if ((!i && VIR_STRDUP(name, path) < 0) || + (i && virAsprintf(&name, "%s-%u", path, i) < 0)) return 0; - } for (j = 0; j < strlen(name); j++) if (name[j] == '/') @@ -195,7 +184,8 @@ parallelsPoolCreateByPath(virConnectPtr conn, const char *path) } def->type = VIR_STORAGE_POOL_DIR; - def->target.path = strdup(path); + if (VIR_STRDUP(def->target.path, path) < 0) + goto error; if (!(pool = virStoragePoolObjAssignDef(pools, def))) goto error; @@ -324,8 +314,8 @@ static int parallelsAddDiskVolume(virStoragePoolObjPtr pool, if (!(def->target.path = realpath(diskPath, NULL))) goto no_memory; - if (!(def->key = strdup(def->target.path))) - goto no_memory; + if (VIR_STRDUP(def->key, def->target.path) < 0) + goto error; if (VIR_REALLOC_N(pool->volumes.objs, pool->volumes.count + 1) < 0) goto no_memory; @@ -425,8 +415,8 @@ static int parallelsLoadPools(virConnectPtr conn) char *base = NULL; size_t i; - if ((base = strdup(SYSCONFDIR "/libvirt")) == NULL) - goto out_of_memory; + if (VIR_STRDUP(base, SYSCONFDIR "/libvirt") < 0) + goto error; /* Configuration path is /etc/libvirt/parallels-storage/... . */ if (virAsprintf(&storageState->configDir, @@ -540,9 +530,9 @@ parallelsConnectListStoragePools(virConnectPtr conn, char **const names, int nna for (i = 0; i < privconn->pools.count && n < nnames; i++) { virStoragePoolObjLock(privconn->pools.objs[i]); if (virStoragePoolObjIsActive(privconn->pools.objs[i]) && - !(names[n++] = strdup(privconn->pools.objs[i]->def->name))) { + VIR_STRDUP(names[n++], privconn->pools.objs[i]->def->name) < 0) { virStoragePoolObjUnlock(privconn->pools.objs[i]); - goto no_memory; + goto error; } virStoragePoolObjUnlock(privconn->pools.objs[i]); } @@ -550,8 +540,7 @@ parallelsConnectListStoragePools(virConnectPtr conn, char **const names, int nna return n; -no_memory: - virReportOOMError(); +error: for (n = 0; n < nnames; n++) VIR_FREE(names[n]); parallelsDriverUnlock(privconn); @@ -590,9 +579,9 @@ parallelsConnectListDefinedStoragePools(virConnectPtr conn, for (i = 0; i < privconn->pools.count && n < nnames; i++) { virStoragePoolObjLock(privconn->pools.objs[i]); if (!virStoragePoolObjIsActive(privconn->pools.objs[i]) && - !(names[n++] = strdup(privconn->pools.objs[i]->def->name))) { + VIR_STRDUP(names[n++], privconn->pools.objs[i]->def->name) < 0) { virStoragePoolObjUnlock(privconn->pools.objs[i]); - goto no_memory; + goto error; } virStoragePoolObjUnlock(privconn->pools.objs[i]); } @@ -600,7 +589,7 @@ parallelsConnectListDefinedStoragePools(virConnectPtr conn, return n; -no_memory: +error: virReportOOMError(); for (n = 0; n < nnames; n++) VIR_FREE(names[n]); @@ -758,11 +747,8 @@ parallelsStoragePoolDefineXML(virConnectPtr conn, } def = NULL; - pool->configFile = strdup("\0"); - if (!pool->configFile) { - virReportOOMError(); + if (VIR_STRDUP(pool->configFile, "\0") < 0) goto cleanup; - } ret = virGetStoragePool(conn, pool->def->name, pool->def->uuid, NULL, NULL); @@ -1085,10 +1071,8 @@ parallelsStoragePoolListVolumes(virStoragePoolPtr pool, } for (i = 0; i < privpool->volumes.count && n < maxnames; i++) { - if ((names[n++] = strdup(privpool->volumes.objs[i]->name)) == NULL) { - virReportOOMError(); + if (VIR_STRDUP(names[n++], privpool->volumes.objs[i]->name) < 0) goto error; - } } virStoragePoolObjUnlock(privpool); @@ -1271,11 +1255,8 @@ parallelsStorageVolDefineXML(virStoragePoolObjPtr pool, goto cleanup; } - privvol->key = strdup(privvol->target.path); - if (privvol->key == NULL) { - virReportOOMError(); + if (VIR_STRDUP(privvol->key, privvol->target.path) < 0) goto cleanup; - } if (is_new) { xml_path = parallelsAddFileExt(privvol->target.path, ".xml"); @@ -1412,11 +1393,8 @@ parallelsStorageVolCreateXMLFrom(virStoragePoolPtr pool, goto cleanup; } - privvol->key = strdup(privvol->target.path); - if (privvol->key == NULL) { - virReportOOMError(); + if (VIR_STRDUP(privvol->key, privvol->target.path) < 0) goto cleanup; - } privpool->def->allocation += privvol->allocation; privpool->def->available = (privpool->def->capacity - @@ -1659,9 +1637,7 @@ parallelsStorageVolGetPath(virStorageVolPtr vol) goto cleanup; } - ret = strdup(privvol->target.path); - if (ret == NULL) - virReportOOMError(); + ignore_value(VIR_STRDUP(ret, privvol->target.path)); cleanup: if (privpool) -- 1.8.1.5

--- src/phyp/phyp_driver.c | 50 ++++++++++---------------------------------------- 1 file changed, 10 insertions(+), 40 deletions(-) diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index 85eb650..7079974 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -954,12 +954,8 @@ openSSHSession(virConnectPtr conn, virConnectAuthPtr auth, } if (conn->uri->user != NULL) { - username = strdup(conn->uri->user); - - if (username == NULL) { - virReportOOMError(); + if (VIR_STRDUP(username, conn->uri->user) < 0) goto err; - } } else { if (auth == NULL || auth->cb == NULL) { virReportError(VIR_ERR_AUTH_FAILED, @@ -1141,15 +1137,9 @@ phypConnectOpen(virConnectPtr conn, if (conn->uri->path) { /* need to shift one byte in order to remove the first "/" of URI component */ - if (conn->uri->path[0] == '/') - managed_system = strdup(conn->uri->path + 1); - else - managed_system = strdup(conn->uri->path); - - if (!managed_system) { - virReportOOMError(); + if (VIR_STRDUP(managed_system, conn->uri->path[0] == '/' ? + conn->uri->path + 1 : conn->uri->path) < 0) goto failure; - } /* here we are handling only the first component of the path, * so skipping the second: @@ -1498,12 +1488,8 @@ phypGetBackingDevice(virConnectPtr conn, const char *managed_system, else goto cleanup; - backing_device = strdup(char_ptr); - - if (backing_device == NULL) { - virReportOOMError(); + if (VIR_STRDUP(backing_device, char_ptr) < 0) goto cleanup; - } } else { backing_device = ret; ret = NULL; @@ -1731,12 +1717,8 @@ phypDomainAttachDevice(virDomainPtr domain, const char *xml) goto cleanup; } - def->os.type = strdup("aix"); - - if (def->os.type == NULL) { - virReportOOMError(); + if (VIR_STRDUP(def->os.type, "aix") < 0) goto cleanup; - } dev = virDomainDeviceDefParse(xml, def, phyp_driver->caps, NULL, VIR_DOMAIN_XML_INACTIVE); @@ -2281,12 +2263,8 @@ phypStorageVolGetXMLDesc(virStorageVolPtr vol, unsigned int flags) goto cleanup; } - voldef.key = strdup(vol->key); - - if (voldef.key == NULL) { - virReportOOMError(); + if (VIR_STRDUP(voldef.key, vol->key) < 0) goto cleanup; - } voldef.type = VIR_STORAGE_POOL_LOGICAL; @@ -2399,10 +2377,8 @@ phypStoragePoolListVolumes(virStoragePoolPtr pool, char **const volumes, if (char_ptr) { *char_ptr = '\0'; - if ((volumes[got++] = strdup(volumes_list)) == NULL) { - virReportOOMError(); + if (VIR_STRDUP(volumes[got++], volumes_list) < 0) goto cleanup; - } char_ptr++; volumes_list = char_ptr; } else @@ -2600,10 +2576,8 @@ phypConnectListStoragePools(virConnectPtr conn, char **const pools, int npools) if (char_ptr) { *char_ptr = '\0'; - if ((pools[got++] = strdup(storage_pools)) == NULL) { - virReportOOMError(); + if (VIR_STRDUP(pools[got++], storage_pools) < 0) goto cleanup; - } char_ptr++; storage_pools = char_ptr; } else @@ -3067,10 +3041,8 @@ phypConnectListInterfaces(virConnectPtr conn, char **const names, int nnames) if (char_ptr) { *char_ptr = '\0'; - if ((names[got++] = strdup(networks)) == NULL) { - virReportOOMError(); + if (VIR_STRDUP(names[got++], networks) < 0) goto cleanup; - } char_ptr++; networks = char_ptr; } else { @@ -3234,10 +3206,8 @@ phypConnectListDefinedDomains(virConnectPtr conn, char **const names, int nnames if (char_ptr) { *char_ptr = '\0'; - if ((names[got++] = strdup(domains)) == NULL) { - virReportOOMError(); + if (VIR_STRDUP(names[got++], domains) < 0) goto cleanup; - } char_ptr++; domains = char_ptr; } else -- 1.8.1.5

--- include/libvirt/libvirt.h.in | 10 +- src/qemu/qemu_capabilities.c | 79 ++++---- src/qemu/qemu_cgroup.c | 4 +- src/qemu/qemu_command.c | 419 +++++++++++++++++-------------------------- src/qemu/qemu_conf.c | 58 +++--- src/qemu/qemu_domain.c | 26 ++- src/qemu/qemu_driver.c | 113 ++++-------- src/qemu/qemu_hotplug.c | 15 +- src/qemu/qemu_migration.c | 20 +-- src/qemu/qemu_monitor_json.c | 63 ++----- src/qemu/qemu_monitor_text.c | 15 +- src/qemu/qemu_process.c | 64 +++---- src/remote/remote_driver.c | 2 +- 13 files changed, 333 insertions(+), 555 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 693b834..9a8090d 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -1294,7 +1294,7 @@ typedef enum { struct _virConnectCredential { int type; /* One of virConnectCredentialType constants */ - const char *prompt; /* Prompt to show to user */ + char *prompt; /* Prompt to show to user */ const char *challenge; /* Additional challenge to show */ const char *defresult; /* Optional default result */ char *result; /* Result to be filled with user response (or defresult) */ @@ -4504,8 +4504,8 @@ typedef enum { */ struct _virDomainEventGraphicsAddress { int family; /* Address family, virDomainEventGraphicsAddressType */ - const char *node; /* Address of node (eg IP address, or UNIX path) */ - const char *service; /* Service name/number (eg TCP port, or NULL) */ + char *node; /* Address of node (eg IP address, or UNIX path) */ + char *service; /* Service name/number (eg TCP port, or NULL) */ }; typedef struct _virDomainEventGraphicsAddress virDomainEventGraphicsAddress; typedef virDomainEventGraphicsAddress *virDomainEventGraphicsAddressPtr; @@ -4520,8 +4520,8 @@ typedef virDomainEventGraphicsAddress *virDomainEventGraphicsAddressPtr; * some examples are 'x509dname' and 'saslUsername'. */ struct _virDomainEventGraphicsSubjectIdentity { - const char *type; /* Type of identity */ - const char *name; /* Identity value */ + char *type; /* Type of identity */ + char *name; /* Identity value */ }; typedef struct _virDomainEventGraphicsSubjectIdentity virDomainEventGraphicsSubjectIdentity; typedef virDomainEventGraphicsSubjectIdentity *virDomainEventGraphicsSubjectIdentityPtr; diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index a3a8d1f..7597a4b 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -362,8 +362,8 @@ virQEMUCapsParseMachineTypesStr(const char *output, if (!(t = strchr(p, ' ')) || (next && t >= next)) continue; - if (!(name = strndup(p, t - p))) - goto no_memory; + if (VIR_STRNDUP(name, p, t - p) < 0) + goto error; p = t; if ((t = strstr(p, "(default)")) && (!next || t < next)) @@ -374,9 +374,9 @@ virQEMUCapsParseMachineTypesStr(const char *output, if (!(t = strchr(p, ')')) || (next && t >= next)) continue; - if (!(canonical = strndup(p, t - p))) { + if (VIR_STRNDUP(canonical, p, t - p) < 0) { VIR_FREE(name); - goto no_memory; + goto error; } } @@ -384,7 +384,8 @@ virQEMUCapsParseMachineTypesStr(const char *output, VIR_REALLOC_N(qemuCaps->machineAliases, qemuCaps->nmachineTypes + 1) < 0) { VIR_FREE(name); VIR_FREE(canonical); - goto no_memory; + virReportOOMError(); + goto error; } qemuCaps->nmachineTypes++; if (canonical) { @@ -402,8 +403,7 @@ virQEMUCapsParseMachineTypesStr(const char *output, return 0; -no_memory: - virReportOOMError(); +error: return -1; } @@ -499,10 +499,8 @@ virQEMUCapsParseX86Models(const char *output, len -= 2; } - if (!(qemuCaps->cpuDefinitions[qemuCaps->ncpuDefinitions - 1] = strndup(p, len))) { - virReportOOMError(); + if (VIR_STRNDUP(qemuCaps->cpuDefinitions[qemuCaps->ncpuDefinitions - 1], p, len) < 0) goto cleanup; - } } while ((p = next)); ret = 0; @@ -552,10 +550,8 @@ virQEMUCapsParsePPCModels(const char *output, len = t - p - 1; - if (!(qemuCaps->cpuDefinitions[qemuCaps->ncpuDefinitions - 1] = strndup(p, len))) { - virReportOOMError(); + if (VIR_STRNDUP(qemuCaps->cpuDefinitions[qemuCaps->ncpuDefinitions - 1], p, len) < 0) goto cleanup; - } } while ((p = next)); ret = 0; @@ -1498,10 +1494,8 @@ virQEMUCapsParseDeviceStrObjectTypes(const char *str, virReportOOMError(); goto cleanup; } - if (!(typelist[ntypelist-1] = strndup(tmp, end-tmp))) { - virReportOOMError(); + if (VIR_STRNDUP(typelist[ntypelist-1], tmp, end-tmp) < 0) goto cleanup; - } } *types = typelist; @@ -1555,10 +1549,8 @@ virQEMUCapsParseDeviceStrObjectProps(const char *str, virReportOOMError(); goto cleanup; } - if (!(proplist[nproplist-1] = strndup(tmp, end-tmp))) { - virReportOOMError(); + if (VIR_STRNDUP(proplist[nproplist-1], tmp, end-tmp) < 0) goto cleanup; - } } *props = proplist; @@ -1726,8 +1718,8 @@ virQEMUCapsPtr virQEMUCapsNewCopy(virQEMUCapsPtr qemuCaps) goto no_memory; ret->ncpuDefinitions = qemuCaps->ncpuDefinitions; for (i = 0 ; i < qemuCaps->ncpuDefinitions ; i++) { - if (!(ret->cpuDefinitions[i] = strdup(qemuCaps->cpuDefinitions[i]))) - goto no_memory; + if (VIR_STRDUP(ret->cpuDefinitions[i], qemuCaps->cpuDefinitions[i]) < 0) + goto error; } if (VIR_ALLOC_N(ret->machineTypes, qemuCaps->nmachineTypes) < 0) @@ -1736,17 +1728,18 @@ virQEMUCapsPtr virQEMUCapsNewCopy(virQEMUCapsPtr qemuCaps) goto no_memory; ret->nmachineTypes = qemuCaps->nmachineTypes; for (i = 0 ; i < qemuCaps->nmachineTypes ; i++) { - if (!(ret->machineTypes[i] = strdup(qemuCaps->machineTypes[i]))) - goto no_memory; + if (VIR_STRDUP(ret->machineTypes[i], qemuCaps->machineTypes[i]) < 0) + goto error; if (qemuCaps->machineAliases[i] && - !(ret->machineAliases[i] = strdup(qemuCaps->machineAliases[i]))) - goto no_memory; + VIR_STRDUP(ret->machineAliases[i], qemuCaps->machineAliases[i]) < 0) + goto error; } return ret; no_memory: virReportOOMError(); +error: virObjectUnref(ret); return NULL; } @@ -1848,11 +1841,10 @@ unsigned int virQEMUCapsGetKVMVersion(virQEMUCapsPtr qemuCaps) int virQEMUCapsAddCPUDefinition(virQEMUCapsPtr qemuCaps, const char *name) { - char *tmp = strdup(name); - if (!tmp) { - virReportOOMError(); + char *tmp; + + if (VIR_STRDUP(tmp, name) < 0) return -1; - } if (VIR_EXPAND_N(qemuCaps->cpuDefinitions, qemuCaps->ncpuDefinitions, 1) < 0) { VIR_FREE(tmp); virReportOOMError(); @@ -1897,12 +1889,12 @@ int virQEMUCapsGetMachineTypesCaps(virQEMUCapsPtr qemuCaps, if (VIR_ALLOC(mach) < 0) goto no_memory; if (qemuCaps->machineAliases[i]) { - if (!(mach->name = strdup(qemuCaps->machineAliases[i]))) + if (VIR_STRDUP(mach->name, qemuCaps->machineAliases[i]) < 0) goto no_memory; - if (!(mach->canonical = strdup(qemuCaps->machineTypes[i]))) + if (VIR_STRDUP(mach->canonical, qemuCaps->machineTypes[i]) < 0) goto no_memory; } else { - if (!(mach->name = strdup(qemuCaps->machineTypes[i]))) + if (VIR_STRDUP(mach->name, qemuCaps->machineTypes[i]) < 0) goto no_memory; } (*machines)[i] = mach; @@ -2091,16 +2083,11 @@ virQEMUCapsProbeQMPMachineTypes(virQEMUCapsPtr qemuCaps, } for (i = 0 ; i < nmachines ; i++) { - if (machines[i]->alias) { - if (!(qemuCaps->machineAliases[i] = strdup(machines[i]->alias))) { - virReportOOMError(); - goto cleanup; - } - } - if (!(qemuCaps->machineTypes[i] = strdup(machines[i]->name))) { - virReportOOMError(); + if (machines[i]->alias && + VIR_STRDUP(qemuCaps->machineAliases[i], machines[i]->alias) < 0) + goto cleanup; + if (VIR_STRDUP(qemuCaps->machineTypes[i], machines[i]->name) < 0) goto cleanup; - } if (machines[i]->isDefault) defIdx = i; } @@ -2590,8 +2577,8 @@ virQEMUCapsPtr virQEMUCapsNewForBinary(const char *binary, struct stat sb; int rv; - if (!(qemuCaps->binary = strdup(binary))) - goto no_memory; + if (VIR_STRDUP(qemuCaps->binary, binary) < 0) + goto error; /* We would also want to check faccessat if we cared about ACLs, * but we don't. */ @@ -2621,8 +2608,6 @@ virQEMUCapsPtr virQEMUCapsNewForBinary(const char *binary, return qemuCaps; -no_memory: - virReportOOMError(); error: virObjectUnref(qemuCaps); qemuCaps = NULL; @@ -2672,10 +2657,8 @@ virQEMUCapsCacheNew(const char *libDir, if (!(cache->binaries = virHashCreate(10, virQEMUCapsHashDataFree))) goto error; - if (!(cache->libDir = strdup(libDir))) { - virReportOOMError(); + if (VIR_STRDUP(cache->libDir, libDir) < 0) goto error; - } cache->runUid = runUid; cache->runGid = runGid; diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index 4819cfe..57839b3 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -31,6 +31,7 @@ #include "viralloc.h" #include "virerror.h" #include "domain_audit.h" +#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_QEMU @@ -388,8 +389,7 @@ int qemuInitCgroup(virQEMUDriverPtr driver, goto cleanup; } - if (!(res->partition = strdup("/machine"))) { - virReportOOMError(); + if (VIR_STRDUP(res->partition, "/machine") < 0) { VIR_FREE(res); goto cleanup; } diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 144620c..786ed1e 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -322,10 +322,8 @@ qemuNetworkIfaceConnect(virDomainDefPtr def, return -1; } else if (actualType == VIR_DOMAIN_NET_TYPE_BRIDGE) { - if (!(brname = strdup(virDomainNetGetActualBridgeName(net)))) { - virReportOOMError(); + if (VIR_STRDUP(brname, virDomainNetGetActualBridgeName(net)) < 0) return -1; - } } else { virReportError(VIR_ERR_INTERNAL_ERROR, _("Network type %d is not supported"), @@ -337,10 +335,8 @@ qemuNetworkIfaceConnect(virDomainDefPtr def, STRPREFIX(net->ifname, VIR_NET_GENERATED_PREFIX) || strchr(net->ifname, '%')) { VIR_FREE(net->ifname); - if (!(net->ifname = strdup(VIR_NET_GENERATED_PREFIX "%d"))) { - virReportOOMError(); + if (VIR_STRDUP(net->ifname, VIR_NET_GENERATED_PREFIX "%d") < 0) goto cleanup; - } /* avoid exposing vnet%d in getXMLDesc or error outputs */ template_ifname = true; } @@ -486,17 +482,10 @@ static int qemuAssignDeviceDiskAliasLegacy(virDomainDiskDefPtr disk) { char *dev_name; - if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM && - STREQ(disk->dst, "hdc")) - dev_name = strdup("cdrom"); - else - dev_name = strdup(disk->dst); - - if (!dev_name) { - virReportOOMError(); + if (VIR_STRDUP(dev_name, + disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM && + STREQ(disk->dst, "hdc") ? "cdrom" : disk->dst) < 0) return -1; - } - disk->info.alias = dev_name; return 0; } @@ -513,10 +502,7 @@ char *qemuDeviceDriveHostAlias(virDomainDiskDefPtr disk, return NULL; } } else { - if (!(ret = strdup(disk->info.alias))) { - virReportOOMError(); - return NULL; - } + ignore_value(VIR_STRDUP(ret, disk->info.alias)); } return ret; } @@ -2418,13 +2404,11 @@ static int qemuAddRBDHost(virDomainDiskDefPtr disk, char *hostport) if (port) { *port = '\0'; port += skip; - disk->hosts[disk->nhosts-1].port = strdup(port); - if (!disk->hosts[disk->nhosts-1].port) - goto no_memory; + if (VIR_STRDUP(disk->hosts[disk->nhosts-1].port, port) < 0) + goto error; } else { - disk->hosts[disk->nhosts-1].port = strdup("6789"); - if (!disk->hosts[disk->nhosts-1].port) - goto no_memory; + if (VIR_STRDUP(disk->hosts[disk->nhosts-1].port, "6789") < 0) + goto error; } parts = virStringSplit(hostport, "\\:", 0); @@ -2442,6 +2426,7 @@ static int qemuAddRBDHost(virDomainDiskDefPtr disk, char *hostport) no_memory: virReportOOMError(); +error: VIR_FREE(disk->hosts[disk->nhosts-1].port); VIR_FREE(disk->hosts[disk->nhosts-1].name); return -1; @@ -2455,9 +2440,8 @@ static int qemuParseRBDString(virDomainDiskDefPtr disk) p = strchr(disk->src, ':'); if (p) { - options = strdup(p + 1); - if (!options) - goto no_memory; + if (VIR_STRDUP(options, p + 1) < 0) + goto error; *p = '\0'; } @@ -2482,11 +2466,9 @@ static int qemuParseRBDString(virDomainDiskDefPtr disk) *e = '\0'; } - if (STRPREFIX(p, "id=")) { - disk->auth.username = strdup(p + strlen("id=")); - if (!disk->auth.username) - goto no_memory; - } + if (STRPREFIX(p, "id=") && + VIR_STRDUP(disk->auth.username, p + strlen("id=")) < 0) + goto error; if (STRPREFIX(p, "mon_host=")) { char *h, *sep; @@ -2513,9 +2495,8 @@ static int qemuParseRBDString(virDomainDiskDefPtr disk) VIR_FREE(options); return 0; -no_memory: +error: VIR_FREE(options); - virReportOOMError(); return -1; } @@ -2555,9 +2536,8 @@ qemuParseDriveURIString(virDomainDiskDefPtr def, virURIPtr uri, def->nhosts = 0; /* set to 1 once everything succeeds */ if (def->hosts->transport != VIR_DOMAIN_DISK_PROTO_TRANS_UNIX) { - def->hosts->name = strdup(uri->server); - if (!def->hosts->name) - goto no_memory; + if (VIR_STRDUP(def->hosts->name, uri->server) < 0) + goto error; if (virAsprintf(&def->hosts->port, "%d", uri->port) < 0) goto no_memory; @@ -2567,9 +2547,8 @@ qemuParseDriveURIString(virDomainDiskDefPtr def, virURIPtr uri, if (uri->query) { if (STRPREFIX(uri->query, "socket=")) { sock = strchr(uri->query, '=') + 1; - def->hosts->socket = strdup(sock); - if (!def->hosts->socket) - goto no_memory; + if (VIR_STRDUP(def->hosts->socket, sock) < 0) + goto error; } else { virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid query parameter '%s'"), uri->query); @@ -2580,9 +2559,8 @@ qemuParseDriveURIString(virDomainDiskDefPtr def, virURIPtr uri, if (uri->path) { volimg = uri->path + 1; /* skip the prefix slash */ VIR_FREE(def->src); - def->src = strdup(volimg); - if (!def->src) - goto no_memory; + if (VIR_STRDUP(def->src, volimg) < 0) + goto error; } else { VIR_FREE(def->src); def->src = NULL; @@ -2593,9 +2571,8 @@ qemuParseDriveURIString(virDomainDiskDefPtr def, virURIPtr uri, if (secret) *secret = '\0'; - def->auth.username = strdup(uri->user); - if (!def->auth.username) - goto no_memory; + if (VIR_STRDUP(def->auth.username, uri->user) < 0) + goto error; } def->nhosts = 1; @@ -2675,7 +2652,8 @@ qemuParseNBDString(virDomainDiskDefPtr disk) *src++ = '\0'; h->transport = VIR_DOMAIN_DISK_PROTO_TRANS_UNIX; - h->socket = strdup(host + strlen("unix:")); + if (VIR_STRDUP(h->socket, host + strlen("unix:")) < 0) + goto error; } else { port = strchr(host, ':'); if (!port) { @@ -2685,23 +2663,20 @@ qemuParseNBDString(virDomainDiskDefPtr disk) } *port++ = '\0'; - h->name = strdup(host); - if (!h->name) - goto no_memory; + if (VIR_STRDUP(h->name, host) < 0) + goto error; src = strchr(port, ':'); if (src) *src++ = '\0'; - h->port = strdup(port); - if (!h->port) - goto no_memory; + if (VIR_STRDUP(h->port, port) < 0) + goto error; } if (src && STRPREFIX(src, "exportname=")) { - src = strdup(strchr(src, '=') + 1); - if (!src) - goto no_memory; + if (VIR_STRDUP(src, strchr(src, '=') + 1) < 0) + goto error; } else { src = NULL; } @@ -2751,9 +2726,8 @@ qemuBuildDriveURIString(virConnectPtr conn, transp = virDomainDiskProtocolTransportTypeToString(disk->hosts->transport); if (disk->hosts->transport == VIR_DOMAIN_DISK_PROTO_TRANS_TCP) { - tmpscheme = strdup(scheme); - if (tmpscheme == NULL) - goto no_memory; + if (VIR_STRDUP(tmpscheme, scheme) < 0) + goto cleanup; } else { if (virAsprintf(&tmpscheme, "%s+%s", scheme, transp) < 0) goto no_memory; @@ -5456,9 +5430,10 @@ qemuBuildCpuArgStr(const virQEMUDriverPtr driver, } virBufferAddLit(&buf, "host"); } else { - if (VIR_ALLOC(guest) < 0 || - (cpu->vendor_id && !(guest->vendor_id = strdup(cpu->vendor_id)))) + if (VIR_ALLOC(guest) < 0) goto no_memory; + if (cpu->vendor_id && VIR_STRDUP(guest->vendor_id, cpu->vendor_id) < 0) + goto cleanup; guest->arch = host->arch; if (cpu->match == VIR_CPU_MATCH_MINIMUM) @@ -7039,8 +7014,8 @@ qemuBuildCommandLine(virConnectPtr conn, virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("network disks are only supported with -drive")); } else { - if (!(file = strdup(disk->src))) { - goto no_memory; + if (VIR_STRDUP(file, disk->src) < 0) { + goto error; } } @@ -7875,8 +7850,8 @@ qemuBuildCommandLine(virConnectPtr conn, goto error; } - if (!(optstr = strdup(model))) - goto no_memory; + if (VIR_STRDUP(optstr, model) < 0) + goto error; } virCommandAddArg(cmd, optstr); VIR_FREE(optstr); @@ -8312,17 +8287,16 @@ static int qemuStringToArgvEnv(const char *args, next = strchr(curr, '\n'); if (next) { - arg = strndup(curr, next-curr); + if (VIR_STRNDUP(arg, curr, next-curr) < 0) + goto error; if (*next == '\'' || *next == '"') next++; } else { - arg = strdup(curr); + if (VIR_STRDUP(arg, curr) < 0) + goto error; } - if (!arg) - goto no_memory; - if (argalloc == argcount) { if (VIR_REALLOC_N(arglist, argalloc+10) < 0) { VIR_FREE(arg); @@ -8372,13 +8346,14 @@ static int qemuStringToArgvEnv(const char *args, return 0; no_memory: + virReportOOMError(); +error: for (i = 0 ; progenv && progenv[i] ; i++) VIR_FREE(progenv[i]); VIR_FREE(progenv); for (i = 0 ; i < argcount ; i++) VIR_FREE(arglist[i]); VIR_FREE(arglist); - virReportOOMError(); return -1; } @@ -8452,14 +8427,14 @@ qemuParseKeywords(const char *str, separator = endmark; } - if (!(keyword = strndup(start, separator - start))) - goto no_memory; + if (VIR_STRNDUP(keyword, start, separator - start) < 0) + goto error; if (separator < endmark) { separator++; - if (!(value = strndup(separator, endmark - separator))) { + if (VIR_STRNDUP(value, separator, endmark - separator) < 0) { VIR_FREE(keyword); - goto no_memory; + goto error; } if (strchr(value, ',')) { char *p = strchr(value, ',') + 1; @@ -8563,11 +8538,8 @@ qemuParseCommandLineDisk(virDomainXMLOptionPtr xmlopt, def->type = VIR_DOMAIN_DISK_TYPE_NETWORK; def->protocol = VIR_DOMAIN_DISK_PROTOCOL_RBD; - def->src = strdup(p + strlen("rbd:")); - if (!def->src) { - virReportOOMError(); + if (VIR_STRDUP(def->src, p + strlen("rbd:")) < 0) goto error; - } /* old-style CEPH_ARGS env variable is parsed later */ if (!old_style_ceph_args && qemuParseRBDString(def) < 0) goto cleanup; @@ -8592,11 +8564,8 @@ qemuParseCommandLineDisk(virDomainXMLOptionPtr xmlopt, def->type = VIR_DOMAIN_DISK_TYPE_NETWORK; def->protocol = VIR_DOMAIN_DISK_PROTOCOL_SHEEPDOG; - def->src = strdup(p + strlen("sheepdog:")); - if (!def->src) { - virReportOOMError(); + if (VIR_STRDUP(def->src, p + strlen("sheepdog:")) < 0) goto error; - } /* def->src must be [vdiname] or [host]:[port]:[vdiname] */ port = strchr(def->src, ':'); @@ -8615,18 +8584,12 @@ qemuParseCommandLineDisk(virDomainXMLOptionPtr xmlopt, } def->nhosts = 1; def->hosts->name = def->src; - def->hosts->port = strdup(port); - if (!def->hosts->port) { - virReportOOMError(); + if (VIR_STRDUP(def->hosts->port, port) < 0) goto error; - } def->hosts->transport = VIR_DOMAIN_DISK_PROTO_TRANS_TCP; def->hosts->socket = NULL; - def->src = strdup(vdi); - if (!def->src) { - virReportOOMError(); + if (VIR_STRDUP(def->src, vdi) < 0) goto error; - } } VIR_FREE(p); @@ -8651,11 +8614,8 @@ qemuParseCommandLineDisk(virDomainXMLOptionPtr xmlopt, } else if (STREQ(values[i], "floppy")) def->device = VIR_DOMAIN_DISK_DEVICE_FLOPPY; } else if (STREQ(keywords[i], "format")) { - def->driverName = strdup("qemu"); - if (!def->driverName) { - virReportOOMError(); + if (VIR_STRDUP(def->driverName, "qemu") < 0) goto error; - } def->format = virStorageFileFormatTypeFromString(values[i]); } else if (STREQ(keywords[i], "cache")) { if (STREQ(values[i], "off") || @@ -8795,21 +8755,19 @@ qemuParseCommandLineDisk(virDomainXMLOptionPtr xmlopt, } if (def->bus == VIR_DOMAIN_DISK_BUS_IDE) { - def->dst = strdup("hda"); + ignore_value(VIR_STRDUP(def->dst, "hda")); } else if (def->bus == VIR_DOMAIN_DISK_BUS_SCSI) { - def->dst = strdup("sda"); + ignore_value(VIR_STRDUP(def->dst, "sda")); } else if (def->bus == VIR_DOMAIN_DISK_BUS_VIRTIO) { - def->dst = strdup("vda"); + ignore_value(VIR_STRDUP(def->dst, "vda")); } else if (def->bus == VIR_DOMAIN_DISK_BUS_XEN) { - def->dst = strdup("xvda"); + ignore_value(VIR_STRDUP(def->dst, "xvda")); } else { - def->dst = strdup("hda"); + ignore_value(VIR_STRDUP(def->dst, "hda")); } - if (!def->dst) { - virReportOOMError(); + if (!def->dst) goto error; - } if (STREQ(def->dst, "xvda")) def->dst[3] = 'a' + idx; else @@ -9161,14 +9119,12 @@ qemuParseCommandLineChr(virDomainChrSourceDefPtr source, source->type = VIR_DOMAIN_CHR_TYPE_PTY; } else if (STRPREFIX(val, "file:")) { source->type = VIR_DOMAIN_CHR_TYPE_FILE; - source->data.file.path = strdup(val+strlen("file:")); - if (!source->data.file.path) - goto no_memory; + if (VIR_STRDUP(source->data.file.path, val+strlen("file:")) < 0) + goto error; } else if (STRPREFIX(val, "pipe:")) { source->type = VIR_DOMAIN_CHR_TYPE_PIPE; - source->data.file.path = strdup(val+strlen("pipe:")); - if (!source->data.file.path) - goto no_memory; + if (VIR_STRDUP(source->data.file.path, val+strlen("pipe:")) < 0) + goto error; } else if (STREQ(val, "stdio")) { source->type = VIR_DOMAIN_CHR_TYPE_STDIO; } else if (STRPREFIX(val, "udp:")) { @@ -9179,40 +9135,32 @@ qemuParseCommandLineChr(virDomainChrSourceDefPtr source, host2 = svc1 ? strchr(svc1, '@') : NULL; svc2 = host2 ? strchr(host2, ':') : NULL; - if (svc1 && (svc1 != val)) { - source->data.udp.connectHost = strndup(val, svc1-val); - - if (!source->data.udp.connectHost) - goto no_memory; - } + if (svc1 && svc1 != val && + VIR_STRNDUP(source->data.udp.connectHost, val, svc1-val) < 0) + goto error; if (svc1) { svc1++; - if (host2) - source->data.udp.connectService = strndup(svc1, host2-svc1); - else - source->data.udp.connectService = strdup(svc1); - if (!source->data.udp.connectService) - goto no_memory; + if ((host2 && VIR_STRNDUP(source->data.udp.connectService, + svc1, host2 - svc1) < 0) || + (!host2 && VIR_STRDUP(source->data.udp.connectService, + svc1) < 0)) + goto error; } if (host2) { host2++; - if (svc2 && (svc2 != host2)) { - source->data.udp.bindHost = strndup(host2, svc2-host2); - - if (!source->data.udp.bindHost) - goto no_memory; - } + if (svc2 && svc2 != host2 && + VIR_STRNDUP(source->data.udp.bindHost, host2, svc2-host2) < 0) + goto no_memory; } if (svc2) { svc2++; if (STRNEQ(svc2, "0")) { - source->data.udp.bindService = strdup(svc2); - if (!source->data.udp.bindService) - goto no_memory; + if (VIR_STRDUP(source->data.udp.bindService, svc2) < 0) + goto error; } } } else if (STRPREFIX(val, "tcp:") || @@ -9235,37 +9183,25 @@ qemuParseCommandLineChr(virDomainChrSourceDefPtr source, if (opt && strstr(opt, "server")) source->data.tcp.listen = true; - source->data.tcp.host = strndup(val, svc-val); - if (!source->data.tcp.host) - goto no_memory; + if (VIR_STRNDUP(source->data.tcp.host, val, svc-val) < 0) + goto error; svc++; - if (opt) { - source->data.tcp.service = strndup(svc, opt-svc); - } else { - source->data.tcp.service = strdup(svc); - } - if (!source->data.tcp.service) - goto no_memory; + if ((opt && VIR_STRNDUP(source->data.tcp.service, svc, opt - svc) < 0) || + (!opt && VIR_STRDUP(source->data.tcp.service, svc) < 0)) + goto error; } else if (STRPREFIX(val, "unix:")) { const char *opt; val += strlen("unix:"); opt = strchr(val, ','); source->type = VIR_DOMAIN_CHR_TYPE_UNIX; - if (opt) { - if (strstr(opt, "listen")) - source->data.nix.listen = true; - source->data.nix.path = strndup(val, opt-val); - } else { - source->data.nix.path = strdup(val); - } - if (!source->data.nix.path) - goto no_memory; + if ((opt && VIR_STRNDUP(source->data.nix.path, val, opt - val) < 0) || + (!opt && VIR_STRDUP(source->data.nix.path, val) < 0)) + goto error; } else if (STRPREFIX(val, "/dev")) { source->type = VIR_DOMAIN_CHR_TYPE_DEV; - source->data.file.path = strdup(val); - if (!source->data.file.path) - goto no_memory; + if (VIR_STRDUP(source->data.file.path, val) < 0) + goto error; } else { virReportError(VIR_ERR_INTERNAL_ERROR, _("unknown character device syntax %s"), val); @@ -9318,13 +9254,9 @@ qemuParseCommandLineCPU(virDomainDefPtr dom, next++; if (p == val) { - if (next) - model = strndup(p, next - p - 1); - else - model = strdup(p); - - if (!model) - goto no_memory; + if ((next && VIR_STRNDUP(model, p, next - p -1) < 0) || + (!next && VIR_STRDUP(model, p) < 0)) + goto error; if (!STREQ(model, "qemu32") && !STREQ(model, "qemu64")) { if (!(cpu = qemuInitGuestCPU(dom))) @@ -9347,13 +9279,9 @@ qemuParseCommandLineCPU(virDomainDefPtr dom, if (*p == '\0' || *p == ',') goto syntax; - if (next) - feature = strndup(p, next - p - 1); - else - feature = strdup(p); - - if (!feature) - goto no_memory; + if ((next && VIR_STRNDUP(feature, p, next - p - 1) < 0) || + (!next && VIR_STRDUP(feature, p) < 0)) + goto error; if (STREQ(feature, "kvmclock")) { bool present = (policy == VIR_CPU_FEATURE_REQUIRE); @@ -9411,13 +9339,9 @@ qemuParseCommandLineCPU(virDomainDefPtr dom, if (*p == '\0' || *p == ',') goto syntax; - if (next) - feature = strndup(p, next - p - 1); - else - feature = strdup(p); - - if (!feature) - goto no_memory; + if ((next && VIR_STRNDUP(feature, p, next - p - 1) < 0) || + (!next && VIR_STRDUP(feature, p) < 0)) + goto error; dom->features |= (1 << VIR_DOMAIN_FEATURE_HYPERV); @@ -9635,8 +9559,8 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr qemuCaps, def->onCrash = VIR_DOMAIN_LIFECYCLE_DESTROY; def->onPoweroff = VIR_DOMAIN_LIFECYCLE_DESTROY; def->virtType = VIR_DOMAIN_VIRT_QEMU; - if (!(def->emulator = strdup(progargv[0]))) - goto no_memory; + if (VIR_STRDUP(def->emulator, progargv[0]) < 0) + goto error; if (strstr(def->emulator, "kvm")) { def->virtType = VIR_DOMAIN_VIRT_KVM; @@ -9646,12 +9570,12 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr qemuCaps, if (strstr(def->emulator, "xenner")) { def->virtType = VIR_DOMAIN_VIRT_KVM; - def->os.type = strdup("xen"); + if (VIR_STRDUP(def->os.type, "xen") < 0) + goto error; } else { - def->os.type = strdup("hvm"); + if (VIR_STRDUP(def->os.type, "hvm") < 0) + goto error; } - if (!def->os.type) - goto no_memory; if (STRPREFIX(def->emulator, "qemu")) path = def->emulator; @@ -9714,10 +9638,9 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr qemuCaps, if (STRPREFIX(val, "unix:")) { /* -vnc unix:/some/big/path */ - vnc->data.vnc.socket = strdup(val + 5); - if (!vnc->data.vnc.socket) { + if (VIR_STRDUP(vnc->data.vnc.socket, val + 5) < 0) { virDomainGraphicsDefFree(vnc); - goto no_memory; + goto error; } } else { /* @@ -9810,9 +9733,8 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr qemuCaps, disk->type = VIR_DOMAIN_DISK_TYPE_FILE; if (STREQ(arg, "-cdrom")) { disk->device = VIR_DOMAIN_DISK_DEVICE_CDROM; - disk->dst = strdup("hdc"); - if (!disk->dst) - goto no_memory; + if (VIR_STRDUP(disk->dst, "hdc") < 0) + goto error; disk->readonly = true; } else { if (STRPREFIX(arg, "-fd")) { @@ -9825,13 +9747,11 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr qemuCaps, else disk->bus = VIR_DOMAIN_DISK_BUS_SCSI; } - disk->dst = strdup(arg + 1); - if (!disk->dst) - goto no_memory; + if (VIR_STRDUP(disk->dst, arg + 1) < 0) + goto error; } - disk->src = strdup(val); - if (!disk->src) - goto no_memory; + if (VIR_STRDUP(disk->src, val) < 0) + goto error; if (disk->type == VIR_DOMAIN_DISK_TYPE_NETWORK) { char *port; @@ -9864,12 +9784,10 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr qemuCaps, goto no_memory; disk->nhosts = 1; disk->hosts->name = disk->src; - disk->hosts->port = strdup(port); - if (!disk->hosts->port) - goto no_memory; - disk->src = strdup(vdi); - if (!disk->src) - goto no_memory; + if (VIR_STRDUP(disk->hosts->port, port) < 0) + goto error; + if (VIR_STRDUP(disk->src, vdi) < 0) + goto error; } break; case VIR_DOMAIN_DISK_PROTOCOL_GLUSTER: @@ -9916,24 +9834,24 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr qemuCaps, def->clock.offset = VIR_DOMAIN_CLOCK_OFFSET_LOCALTIME; } else if (STREQ(arg, "-kernel")) { WANT_VALUE(); - if (!(def->os.kernel = strdup(val))) - goto no_memory; + if (VIR_STRDUP(def->os.kernel, val) < 0) + goto error; } else if (STREQ(arg, "-bios")) { WANT_VALUE(); - if (!(def->os.loader = strdup(val))) - goto no_memory; + if (VIR_STRDUP(def->os.loader, val) < 0) + goto error; } else if (STREQ(arg, "-initrd")) { WANT_VALUE(); - if (!(def->os.initrd = strdup(val))) - goto no_memory; + if (VIR_STRDUP(def->os.initrd, val) < 0) + goto error; } else if (STREQ(arg, "-append")) { WANT_VALUE(); - if (!(def->os.cmdline = strdup(val))) - goto no_memory; + if (VIR_STRDUP(def->os.cmdline, val) < 0) + goto error; } else if (STREQ(arg, "-dtb")) { WANT_VALUE(); - if (!(def->os.dtb = strdup(val))) - goto no_memory; + if (VIR_STRDUP(def->os.dtb, val) < 0) + goto error; } else if (STREQ(arg, "-boot")) { const char *token = NULL; WANT_VALUE(); @@ -9977,11 +9895,11 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr qemuCaps, WANT_VALUE(); process = strstr(val, ",process="); if (process == NULL) { - if (!(def->name = strdup(val))) - goto no_memory; + if (VIR_STRDUP(def->name, val) < 0) + goto error; } else { - if (!(def->name = strndup(val, process - val))) - goto no_memory; + if (VIR_STRNDUP(def->name, val, process - val) < 0) + goto error; } if (STREQ(def->name, "")) VIR_FREE(def->name); @@ -9991,11 +9909,11 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr qemuCaps, WANT_VALUE(); params = strchr(val, ','); if (params == NULL) { - if (!(def->os.machine = strdup(val))) - goto no_memory; + if (VIR_STRDUP(def->os.machine, val) < 0) + goto error; } else { - if (!(def->os.machine = strndup(val, params - val))) - goto no_memory; + if (VIR_STRNDUP(def->os.machine, val, params - val) < 0) + goto error; while (params++) { /* prepared for more "-machine" parameters */ @@ -10004,11 +9922,8 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr qemuCaps, if (STRPREFIX(tmp, "dump-guest-core=")) { tmp += strlen("dump-guest-core="); - if (params) { - tmp = strndup(tmp, params - tmp); - if (tmp == NULL) - goto no_memory; - } + if (params && VIR_STRNDUP(tmp, tmp, params - tmp) < 0) + goto error; def->mem.dump_core = virDomainMemDumpTypeFromString(tmp); if (def->mem.dump_core <= 0) def->mem.dump_core = VIR_DOMAIN_MEM_DUMP_DEFAULT; @@ -10077,17 +9992,17 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr qemuCaps, } else if (STRPREFIX(val, "disk:")) { if (VIR_ALLOC(disk) < 0) goto no_memory; - disk->src = strdup(val + strlen("disk:")); - if (!disk->src) - goto no_memory; + if (VIR_STRDUP(disk->src, val + strlen("disk:")) < 0) + goto error; if (STRPREFIX(disk->src, "/dev/")) disk->type = VIR_DOMAIN_DISK_TYPE_BLOCK; else disk->type = VIR_DOMAIN_DISK_TYPE_FILE; disk->device = VIR_DOMAIN_DISK_DEVICE_DISK; disk->bus = VIR_DOMAIN_DISK_BUS_USB; - if (!(disk->dst = strdup("sda")) || - VIR_REALLOC_N(def->disks, def->ndisks+1) < 0) + if (VIR_STRDUP(disk->dst, "sda") < 0) + goto error; + if (VIR_REALLOC_N(def->disks, def->ndisks+1) < 0) goto no_memory; def->disks[def->ndisks++] = disk; disk = NULL; @@ -10189,9 +10104,8 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr qemuCaps, def->watchdog->action = action; } else if (STREQ(arg, "-bootloader")) { WANT_VALUE(); - def->os.bootloader = strdup(val); - if (!def->os.bootloader) - goto no_memory; + if (VIR_STRDUP(def->os.bootloader, val) < 0) + goto error; } else if (STREQ(arg, "-vmwarevga")) { video = VIR_DOMAIN_VIDEO_TYPE_VMVGA; } else if (STREQ(arg, "-std-vga")) { @@ -10224,8 +10138,8 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr qemuCaps, } else if (STREQ(arg, "-pidfile")) { WANT_VALUE(); if (pidfile) - if (!(*pidfile = strdup(val))) - goto no_memory; + if (VIR_STRDUP(*pidfile, val) < 0) + goto error; } else if (STREQ(arg, "-incoming")) { WANT_VALUE(); /* ignore, used via restore/migrate APIs */ @@ -10307,9 +10221,8 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr qemuCaps, arg); if (VIR_REALLOC_N(cmd->args, cmd->num_args+1) < 0) goto no_memory; - cmd->args[cmd->num_args] = strdup(arg); - if (cmd->args[cmd->num_args] == NULL) - goto no_memory; + if (VIR_STRDUP(cmd->args[cmd->num_args], arg) < 0) + goto error; cmd->num_args++; } } @@ -10338,9 +10251,8 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr qemuCaps, _("could not parse CEPH_ARGS '%s'"), ceph_args); goto error; } - hosts = strdup(strchr(ceph_args, ' ') + 1); - if (!hosts) - goto no_memory; + if (VIR_STRDUP(hosts, strchr(ceph_args, ' ') + 1) < 0) + goto error; first_rbd_disk->nhosts = 0; token = strtok_r(hosts, ",", &saveptr); while (token != NULL) { @@ -10351,17 +10263,16 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr qemuCaps, port = strchr(token, ':'); if (port) { *port++ = '\0'; - port = strdup(port); - if (!port) { + if (VIR_STRDUP(port, port) < 0) { VIR_FREE(hosts); - goto no_memory; + goto error; } } first_rbd_disk->hosts[first_rbd_disk->nhosts].port = port; - first_rbd_disk->hosts[first_rbd_disk->nhosts].name = strdup(token); - if (!first_rbd_disk->hosts[first_rbd_disk->nhosts].name) { + if (VIR_STRDUP(first_rbd_disk->hosts[first_rbd_disk->nhosts].name, + token) < 0) { VIR_FREE(hosts); - goto no_memory; + goto error; } first_rbd_disk->hosts[first_rbd_disk->nhosts].transport = VIR_DOMAIN_DISK_PROTO_TRANS_TCP; first_rbd_disk->hosts[first_rbd_disk->nhosts].socket = NULL; @@ -10385,8 +10296,8 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr qemuCaps, def->os.arch, virDomainVirtTypeToString(def->virtType)); if (defaultMachine != NULL) - if (!(def->os.machine = strdup(defaultMachine))) - goto no_memory; + if (VIR_STRDUP(def->os.machine, defaultMachine) < 0) + goto error; } if (!nographics && def->ngraphics == 0) { @@ -10398,14 +10309,14 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr qemuCaps, sdl->type = VIR_DOMAIN_GRAPHICS_TYPE_SDL; sdl->data.sdl.fullscreen = fullscreen; if (display && - !(sdl->data.sdl.display = strdup(display))) { + VIR_STRDUP(sdl->data.sdl.display, display) < 0) { VIR_FREE(sdl); - goto no_memory; + goto error; } if (xauth && - !(sdl->data.sdl.xauth = strdup(xauth))) { + VIR_STRDUP(sdl->data.sdl.xauth, xauth) < 0) { VIR_FREE(sdl); - goto no_memory; + goto error; } if (VIR_REALLOC_N(def->graphics, def->ngraphics+1) < 0) { @@ -10522,7 +10433,7 @@ static int qemuParseProcFileStrings(int pid_value, ssize_t len; char *tmp; size_t nstr = 0; - const char **str = NULL; + char **str = NULL; int i; if (virAsprintf(&path, "/proc/%d/%s", pid_value, name) < 0) { @@ -10540,10 +10451,8 @@ static int qemuParseProcFileStrings(int pid_value, goto cleanup; } - if (!(str[nstr-1] = strdup(tmp))) { - virReportOOMError(); + if (VIR_STRDUP(str[nstr-1], tmp) < 0) goto cleanup; - } /* Skip arg */ tmp += strlen(tmp); /* Skip \0 separator */ @@ -10558,7 +10467,7 @@ static int qemuParseProcFileStrings(int pid_value, str[nstr-1] = NULL; ret = nstr-1; - *list = str; + *list = (const char **) str; cleanup: if (ret < 0) { diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index c16b90d..11ff61f 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -140,8 +140,8 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) "%s/log/libvirt/qemu", LOCALSTATEDIR) < 0) goto no_memory; - if ((cfg->configBaseDir = strdup(SYSCONFDIR "/libvirt")) == NULL) - goto no_memory; + if (VIR_STRDUP(cfg->configBaseDir, SYSCONFDIR "/libvirt") < 0) + goto error; if (virAsprintf(&cfg->stateDir, "%s/run/libvirt/qemu", LOCALSTATEDIR) < 0) @@ -210,19 +210,17 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) goto no_memory; - if (!(cfg->vncListen = strdup("127.0.0.1"))) - goto no_memory; + if (VIR_STRDUP(cfg->vncListen, "127.0.0.1") < 0) + goto error; - if (!(cfg->vncTLSx509certdir - = strdup(SYSCONFDIR "/pki/libvirt-vnc"))) - goto no_memory; + if (VIR_STRDUP(cfg->vncTLSx509certdir, SYSCONFDIR "/pki/libvirt-vnc") < 0) + goto error; - if (!(cfg->spiceListen = strdup("127.0.0.1"))) - goto no_memory; + if (VIR_STRDUP(cfg->spiceListen, "127.0.0.1") < 0) + goto error; - if (!(cfg->spiceTLSx509certdir - = strdup(SYSCONFDIR "/pki/libvirt-spice"))) - goto no_memory; + if (VIR_STRDUP(cfg->spiceTLSx509certdir , SYSCONFDIR "/pki/libvirt-spice") < 0) + goto error; cfg->remotePortMin = QEMU_REMOTE_PORT_MIN; cfg->remotePortMax = QEMU_REMOTE_PORT_MAX; @@ -240,8 +238,8 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) } } #endif - if (!(cfg->bridgeHelperName = strdup("/usr/libexec/qemu-bridge-helper"))) - goto no_memory; + if (VIR_STRDUP(cfg->bridgeHelperName, "/usr/libexec/qemu-bridge-helper") < 0) + goto error; cfg->clearEmulatorCapabilities = true; @@ -347,8 +345,8 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, CHECK_TYPE(NAME, VIR_CONF_STRING); \ if (p && p->str) { \ VIR_FREE(VAR); \ - if (!(VAR = strdup(p->str))) \ - goto no_memory; \ + if (VIR_STRDUP(VAR, p->str) < 0) \ + goto cleanup; \ } GET_VALUE_BOOL("vnc_auto_unix_socket", cfg->vncAutoUnixSocket); @@ -379,16 +377,17 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, goto no_memory; for (i = 0, pp = p->list; pp; i++, pp = pp->next) { - if (!(cfg->securityDriverNames[i] = strdup(pp->str))) - goto no_memory; + if (VIR_STRDUP(cfg->securityDriverNames[i], pp->str) < 0) + goto cleanup; } cfg->securityDriverNames[len] = NULL; } else { CHECK_TYPE("security_driver", VIR_CONF_STRING); if (p && p->str) { - if (VIR_ALLOC_N(cfg->securityDriverNames, 2) < 0 || - !(cfg->securityDriverNames[0] = strdup(p->str))) + if (VIR_ALLOC_N(cfg->securityDriverNames, 2) < 0) goto no_memory; + if (VIR_STRDUP(cfg->securityDriverNames[0], p->str) < 0) + goto cleanup; cfg->securityDriverNames[1] = NULL; } @@ -486,8 +485,8 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, "list of strings")); goto cleanup; } - if (!(cfg->cgroupDeviceACL[i] = strdup(pp->str))) - goto no_memory; + if (VIR_STRDUP(cfg->cgroupDeviceACL[i], pp->str) < 0) + goto cleanup; } cfg->cgroupDeviceACL[i] = NULL; } @@ -586,10 +585,9 @@ virCapsPtr virQEMUDriverCreateCapabilities(virQEMUDriverPtr driver) for (i = 0; sec_managers[i]; i++) { doi = virSecurityManagerGetDOI(sec_managers[i]); model = virSecurityManagerGetModel(sec_managers[i]); - if (!(caps->host.secModels[i].model = strdup(model))) - goto no_memory; - if (!(caps->host.secModels[i].doi = strdup(doi))) - goto no_memory; + if (VIR_STRDUP(caps->host.secModels[i].model, model) < 0 || + VIR_STRDUP(caps->host.secModels[i].doi, doi) < 0) + goto error; VIR_DEBUG("Initialized caps for security driver \"%s\" with " "DOI \"%s\"", model, doi); } @@ -1070,10 +1068,8 @@ qemuSharedDiskEntryCopy(const qemuSharedDiskEntryPtr entry) } for (i = 0; i < entry->ref; i++) { - if (!(ret->domains[i] = strdup(entry->domains[i]))) { - virReportOOMError(); + if (VIR_STRDUP(ret->domains[i], entry->domains[i]) < 0) goto cleanup; - } ret->ref++; } @@ -1135,7 +1131,7 @@ qemuAddSharedDisk(virQEMUDriverPtr driver, goto cleanup; if ((VIR_EXPAND_N(new_entry->domains, new_entry->ref, 1) < 0) || - !(new_entry->domains[new_entry->ref - 1] = strdup(name))) { + VIR_STRDUP(new_entry->domains[new_entry->ref - 1], name) < 0) { qemuSharedDiskEntryFree(new_entry, NULL); virReportOOMError(); goto cleanup; @@ -1148,7 +1144,7 @@ qemuAddSharedDisk(virQEMUDriverPtr driver, } else { if ((VIR_ALLOC(entry) < 0) || (VIR_ALLOC_N(entry->domains, 1) < 0) || - !(entry->domains[0] = strdup(name))) { + VIR_STRDUP(entry->domains[0], name) < 0) { qemuSharedDiskEntryFree(entry, NULL); virReportOOMError(); goto cleanup; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 33088ea..6dc0436 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -730,14 +730,10 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, if (dev->type == VIR_DOMAIN_DEVICE_NET && dev->data.net->type != VIR_DOMAIN_NET_TYPE_HOSTDEV && !dev->data.net->model) { - if (def->os.arch == VIR_ARCH_S390 || - def->os.arch == VIR_ARCH_S390X) - dev->data.net->model = strdup("virtio"); - else - dev->data.net->model = strdup("rtl8139"); - - if (!dev->data.net->model) - goto no_memory; + if (VIR_STRDUP(dev->data.net->model, + def->os.arch == VIR_ARCH_S390 || + def->os.arch == VIR_ARCH_S390X ? "virtio" : "rtl8139") < 0) + goto cleanup; } /* set default disk types and drivers */ @@ -761,8 +757,8 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, } else { /* default driver if probing is forbidden */ if (!disk->driverName && - !(disk->driverName = strdup("qemu"))) - goto no_memory; + VIR_STRDUP(disk->driverName, "qemu") < 0) + goto cleanup; /* default disk format for drives */ if (disk->format == VIR_STORAGE_FILE_NONE && @@ -804,8 +800,10 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, if (virAsprintf(&dev->data.chr->source.data.nix.path, "%s/channel/target/%s.%s", cfg->libDir, def->name, - dev->data.chr->target.name) < 0) - goto no_memory; + dev->data.chr->target.name) < 0) { + virReportOOMError(); + goto cleanup; + } dev->data.chr->source.data.nix.listen = true; } @@ -814,10 +812,6 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, cleanup: virObjectUnref(cfg); return ret; - -no_memory: - virReportOOMError(); - goto cleanup; } diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d5d7de3..feaf49a 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1441,10 +1441,8 @@ qemuCanonicalizeMachine(virDomainDefPtr def, virQEMUCapsPtr qemuCaps) if (STRNEQ(canon, def->os.machine)) { char *tmp; - if (!(tmp = strdup(canon))) { - virReportOOMError(); + if (VIR_STRDUP(tmp, canon) < 0) return -1; - } VIR_FREE(def->os.machine); def->os.machine = tmp; } @@ -2014,8 +2012,7 @@ static char *qemuDomainGetOSType(virDomainPtr dom) { if (!(vm = qemuDomObjFromDomain(dom))) goto cleanup; - if (!(type = strdup(vm->def->os.type))) - virReportOOMError(); + ignore_value(VIR_STRDUP(type, vm->def->os.type)); cleanup: if (vm) @@ -3392,7 +3389,7 @@ qemuDomainScreenshot(virDomainPtr dom, goto endjob; } - ret = strdup("image/x-portable-pixmap"); + ignore_value(VIR_STRDUP(ret, "image/x-portable-pixmap")); endjob: VIR_FORCE_CLOSE(tmp_fd); @@ -5140,11 +5137,8 @@ static char *qemuConnectDomainXMLFromNative(virConnectPtr conn, if (!def) goto cleanup; - if (!def->name && - !(def->name = strdup("unnamed"))) { - virReportOOMError(); + if (!def->name && VIR_STRDUP(def->name, "unnamed") < 0) goto cleanup; - } xml = qemuDomainDefFormatXML(driver, def, VIR_DOMAIN_XML_INACTIVE); @@ -5210,11 +5204,9 @@ static char *qemuConnectDomainXMLToNative(virConnectPtr conn, if ((actualType == VIR_DOMAIN_NET_TYPE_BRIDGE) && (brname = virDomainNetGetActualBridgeName(net))) { - char *brnamecopy = strdup(brname); - if (!brnamecopy) { - virReportOOMError(); + char *brnamecopy; + if (VIR_STRDUP(brnamecopy, brname) < 0) goto cleanup; - } virDomainActualNetDefFree(net->data.network.actual); @@ -6634,9 +6626,7 @@ static char *qemuDomainGetSchedulerType(virDomainPtr dom, *nparams = 5; } - ret = strdup("posix"); - if (!ret) - virReportOOMError(); + ignore_value(VIR_STRDUP(ret, "posix")); cleanup: if (vm) @@ -6694,11 +6684,8 @@ qemuDomainParseDeviceWeightStr(char *deviceWeightStr, if (!p) goto error; - result[i].path = strndup(temp, p - temp); - if (!result[i].path) { - virReportOOMError(); + if (VIR_STRNDUP(result[i].path, temp, p - temp) < 0) goto cleanup; - } /* weight */ temp = p + 1; @@ -7062,13 +7049,8 @@ qemuDomainGetBlkioParameters(virDomainPtr dom, } param->value.s = virBufferContentAndReset(&buf); } - if (!param->value.s) { - param->value.s = strdup(""); - if (!param->value.s) { - virReportOOMError(); - goto cleanup; - } - } + if (!param->value.s && VIR_STRDUP(param->value.s, "") < 0) + goto cleanup; param->type = VIR_TYPED_PARAM_STRING; if (virStrcpyStatic(param->field, VIR_DOMAIN_BLKIO_DEVICE_WEIGHT) == NULL) { @@ -7590,8 +7572,8 @@ qemuDomainGetNumaParameters(virDomainPtr dom, case 1: /* fill numa nodeset here */ if (flags & VIR_DOMAIN_AFFECT_CONFIG) { nodeset = virBitmapFormat(persistentDef->numatune.memory.nodemask); - if (!nodeset) - nodeset = strdup(""); + if (!nodeset && VIR_STRDUP(nodeset, "") < 0) + goto cleanup; } else { rc = virCgroupGetCpusetMems(priv->cgroup, &nodeset); if (rc != 0) { @@ -10582,9 +10564,8 @@ qemuDomainSnapshotCreateInactiveExternal(virQEMUDriverPtr driver, if (snapdisk->snapshot == VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL) { VIR_FREE(defdisk->src); - if (!(defdisk->src = strdup(snapdisk->file))) { + if (VIR_STRDUP(defdisk->src, snapdisk->file) < 0) { /* we cannot rollback here in a sane way */ - virReportOOMError(); goto cleanup; } defdisk->format = snapdisk->format; @@ -10873,9 +10854,8 @@ qemuDomainSnapshotCreateSingleDiskActive(virQEMUDriverPtr driver, } if (virAsprintf(&device, "drive-%s", disk->info.alias) < 0 || - !(source = strdup(snap->file)) || - (persistDisk && - !(persistSource = strdup(source)))) { + VIR_STRDUP(source, snap->file) < 0 || + (persistDisk && VIR_STRDUP(persistSource, source) < 0)) { virReportOOMError(); goto cleanup; } @@ -10952,12 +10932,9 @@ qemuDomainSnapshotUndoSingleDiskActive(virQEMUDriverPtr driver, char *persistSource = NULL; struct stat st; - if (!(source = strdup(origdisk->src)) || - (persistDisk && - !(persistSource = strdup(source)))) { - virReportOOMError(); + if (VIR_STRDUP(source, origdisk->src) < 0 || + (persistDisk && VIR_STRDUP(persistSource, source) < 0)) goto cleanup; - } qemuDomainPrepareDiskChainElement(driver, vm, disk, origdisk->src, VIR_DISK_CHAIN_NO_ACCESS); @@ -11561,13 +11538,9 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain, if (update_current) snap->def->current = true; if (vm->current_snapshot) { - if (!(flags & VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE)) { - snap->def->parent = strdup(vm->current_snapshot->def->name); - if (snap->def->parent == NULL) { - virReportOOMError(); + if (!(flags & VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE) && + VIR_STRDUP(snap->def->parent, vm->current_snapshot->def->name) < 0) goto cleanup; - } - } if (update_current) { vm->current_snapshot->def->current = false; if (qemuDomainSnapshotWriteMetadata(vm, vm->current_snapshot, @@ -12346,14 +12319,10 @@ qemuDomainSnapshotReparentChildren(void *payload, VIR_FREE(snap->def->parent); snap->parent = rep->parent; - if (rep->parent->def) { - snap->def->parent = strdup(rep->parent->def->name); - - if (snap->def->parent == NULL) { - virReportOOMError(); - rep->err = -1; - return; - } + if (rep->parent->def && + VIR_STRDUP(snap->def->parent, rep->parent->def->name) < 0) { + rep->err = -1; + return; } if (!snap->sibling) @@ -13260,10 +13229,8 @@ qemuDomainBlockCopy(virDomainPtr dom, const char *path, } if (!format && disk->mirrorFormat > 0) format = virStorageFileFormatTypeToString(disk->mirrorFormat); - if (!(mirror = strdup(dest))) { - virReportOOMError(); + if (VIR_STRDUP(mirror, dest) < 0) goto endjob; - } if (qemuDomainPrepareDiskChainElement(driver, vm, disk, dest, VIR_DISK_CHAIN_READ_WRITE) < 0) { @@ -13894,10 +13861,8 @@ qemuDomainGetDiskErrors(virDomainPtr dom, if (n == nerrors) break; - if (!(errors[n].disk = strdup(disk->dst))) { - virReportOOMError(); + if (VIR_STRDUP(errors[n].disk, disk->dst) < 0) goto endjob; - } errors[n].error = info->io_status; n++; } @@ -13954,15 +13919,13 @@ qemuDomainSetMetadata(virDomainPtr dom, switch ((virDomainMetadataType) type) { case VIR_DOMAIN_METADATA_DESCRIPTION: VIR_FREE(vm->def->description); - if (metadata && - !(vm->def->description = strdup(metadata))) - goto no_memory; + if (metadata && VIR_STRDUP(vm->def->description, metadata) < 0) + goto cleanup; break; case VIR_DOMAIN_METADATA_TITLE: VIR_FREE(vm->def->title); - if (metadata && - !(vm->def->title = strdup(metadata))) - goto no_memory; + if (metadata && VIR_STRDUP(vm->def->title, metadata) < 0) + goto cleanup; break; case VIR_DOMAIN_METADATA_ELEMENT: virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", @@ -13982,15 +13945,13 @@ qemuDomainSetMetadata(virDomainPtr dom, switch ((virDomainMetadataType) type) { case VIR_DOMAIN_METADATA_DESCRIPTION: VIR_FREE(persistentDef->description); - if (metadata && - !(persistentDef->description = strdup(metadata))) - goto no_memory; + if (metadata && VIR_STRDUP(persistentDef->description, metadata) < 0) + goto cleanup; break; case VIR_DOMAIN_METADATA_TITLE: VIR_FREE(persistentDef->title); - if (metadata && - !(persistentDef->title = strdup(metadata))) - goto no_memory; + if (metadata && VIR_STRDUP(persistentDef->title, metadata) < 0) + goto cleanup; break; case VIR_DOMAIN_METADATA_ELEMENT: virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", @@ -14016,9 +13977,6 @@ cleanup: virObjectUnref(caps); virObjectUnref(cfg); return ret; -no_memory: - virReportOOMError(); - goto cleanup; } static char * @@ -14076,10 +14034,7 @@ qemuDomainGetMetadata(virDomainPtr dom, goto cleanup; } - if (!(ret = strdup(field))) { - virReportOOMError(); - goto cleanup; - } + ignore_value(VIR_STRDUP(ret, field)); cleanup: if (vm) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index a4f48b0..c464712 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1283,10 +1283,8 @@ qemuDomainNetGetBridgeName(virConnectPtr conn, virDomainNetDefPtr net) goto cleanup; } /* we need a copy, not just a pointer to the original */ - if (!(brname = strdup(tmpbr))) { - virReportOOMError(); + if (VIR_STRDUP(brname, tmpbr) < 0) goto cleanup; - } } else if (actualType == VIR_DOMAIN_NET_TYPE_NETWORK) { int active; virErrorPtr errobj; @@ -1539,11 +1537,8 @@ qemuDomainChangeNet(virQEMUDriverPtr driver, } /* ifname: check if it's set in newdev. If not, retain the autogenerated one */ - if (!(newdev->ifname || - (newdev->ifname = strdup(olddev->ifname)))) { - virReportOOMError(); + if (!newdev->ifname && VIR_STRDUP(newdev->ifname, olddev->ifname) < 0) goto cleanup; - } if (STRNEQ_NULLABLE(olddev->ifname, newdev->ifname)) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("cannot modify network device tap name")); @@ -1568,11 +1563,9 @@ qemuDomainChangeNet(virQEMUDriverPtr driver, goto cleanup; } /* grab alias from olddev if not set in newdev */ - if (!(newdev->info.alias || - (newdev->info.alias = strdup(olddev->info.alias)))) { - virReportOOMError(); + if (!newdev->info.alias && + VIR_STRDUP(newdev->info.alias, olddev->info.alias) < 0) goto cleanup; - } if (STRNEQ_NULLABLE(olddev->info.alias, newdev->info.alias)) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("cannot modify network device alias")); diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 0732614..c69eea9 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -316,8 +316,8 @@ qemuMigrationCookieGraphicsAlloc(virQEMUDriverPtr driver, goto error; #endif } - if (!(mig->listen = strdup(listenAddr))) - goto no_memory; + if (VIR_STRDUP(mig->listen, listenAddr) < 0) + goto error; virObjectUnref(cfg); return mig; @@ -400,8 +400,8 @@ qemuMigrationCookieNew(virDomainObjPtr dom) name = priv->origname; else name = dom->def->name; - if (!(mig->name = strdup(name))) - goto no_memory; + if (VIR_STRDUP(mig->name, name) < 0) + goto error; memcpy(mig->uuid, dom->def->uuid, VIR_UUID_BUFLEN); if (!(mig->localHostname = virGetHostname(NULL))) @@ -460,15 +460,14 @@ qemuMigrationCookieAddLockstate(qemuMigrationCookiePtr mig, } if (virDomainObjGetState(dom, NULL) == VIR_DOMAIN_PAUSED) { - if (priv->lockState && - !(mig->lockState = strdup(priv->lockState))) + if (priv->lockState && VIR_STRDUP(mig->lockState, priv->lockState) < 0) return -1; } else { if (virDomainLockProcessInquire(driver->lockManager, dom, &mig->lockState) < 0) return -1; } - if (!(mig->lockDriver = strdup(virLockManagerPluginGetName(driver->lockManager)))) { + if (VIR_STRDUP(mig->lockDriver, virLockManagerPluginGetName(driver->lockManager)) < 0) { VIR_FREE(mig->lockState); return -1; } @@ -2050,8 +2049,7 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, /* Target domain name, maybe renamed. */ if (dname) { origname = def->name; - def->name = strdup(dname); - if (def->name == NULL) + if (VIR_STRDUP(def->name, dname) < 0) goto cleanup; } @@ -2101,10 +2099,8 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, /* QEMU will be started with -incoming stdio * (which qemu_command might convert to exec:cat or fd:n) */ - if (!(migrateFrom = strdup("stdio"))) { - virReportOOMError(); + if (VIR_STRDUP(migrateFrom, "stdio") < 0) goto cleanup; - } } else { virQEMUCapsPtr qemuCaps = NULL; struct addrinfo *info = NULL; diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 6fdd650..50596ea 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -201,11 +201,9 @@ int qemuMonitorJSONIOProcess(qemuMonitorPtr mon, if (nl) { int got = nl - (data + used); - char *line = strndup(data + used, got); - if (!line) { - virReportOOMError(); + char *line; + if (VIR_STRNDUP(line, data + used, got) < 0) return -1; - } used += got + strlen(LINE_ENDING); line[got] = '\0'; /* kill \n */ if (qemuMonitorJSONIOProcessLine(mon, line, msg) < 0) { @@ -958,15 +956,9 @@ qemuMonitorJSONHumanCommandWithFd(qemuMonitorPtr mon, if (reply_str) { const char *data; - if ((data = virJSONValueGetString(obj))) - *reply_str = strdup(data); - else - *reply_str = strdup(""); - - if (!*reply_str) { - virReportOOMError(); + data = virJSONValueGetString(obj); + if (VIR_STRDUP(*reply_str, data ? data : "") < 0) goto cleanup; - } } ret = 0; @@ -2946,11 +2938,9 @@ static int qemuMonitorJSONExtractPtyPaths(virJSONValuePtr reply, } if (STRPREFIX(type, "pty:")) { - char *path = strdup(type + strlen("pty:")); - if (!path) { - virReportOOMError(); + char *path; + if (VIR_STRDUP(path, type + strlen("pty:")) < 0) goto cleanup; - } if (virHashAddEntry(paths, id, path) < 0) { virReportError(VIR_ERR_OPERATION_FAILED, @@ -3925,10 +3915,8 @@ int qemuMonitorJSONGetVersion(qemuMonitorPtr mon, _("query-version reply was missing 'package' version")); goto cleanup; } - if (!(*package = strdup(tmp))) { - virReportOOMError(); + if (VIR_STRDUP(*package, tmp) < 0) goto cleanup; - } } ret = 0; @@ -4001,10 +3989,8 @@ int qemuMonitorJSONGetMachines(qemuMonitorPtr mon, goto cleanup; } - if (!(info->name = strdup(tmp))) { - virReportOOMError(); + if (VIR_STRDUP(info->name, tmp) < 0) goto cleanup; - } if (virJSONValueObjectHasKey(child, "is-default") && virJSONValueObjectGetBoolean(child, "is-default", &info->isDefault) < 0) { @@ -4019,10 +4005,8 @@ int qemuMonitorJSONGetMachines(qemuMonitorPtr mon, _("query-machines reply has malformed 'alias' data")); goto cleanup; } - if (!(info->alias = strdup(tmp))) { - virReportOOMError(); + if (VIR_STRDUP(info->alias, tmp) < 0) goto cleanup; - } } } @@ -4106,10 +4090,8 @@ int qemuMonitorJSONGetCPUDefinitions(qemuMonitorPtr mon, goto cleanup; } - if (!(cpulist[i] = strdup(tmp))) { - virReportOOMError(); + if (VIR_STRDUP(cpulist[i], tmp) < 0) goto cleanup; - } } ret = n; @@ -4180,10 +4162,8 @@ int qemuMonitorJSONGetCommands(qemuMonitorPtr mon, goto cleanup; } - if (!(commandlist[i] = strdup(tmp))) { - virReportOOMError(); + if (VIR_STRDUP(commandlist[i], tmp) < 0) goto cleanup; - } } ret = n; @@ -4259,10 +4239,8 @@ int qemuMonitorJSONGetEvents(qemuMonitorPtr mon, goto cleanup; } - if (!(eventlist[i] = strdup(tmp))) { - virReportOOMError(); + if (VIR_STRDUP(eventlist[i], tmp) < 0) goto cleanup; - } } ret = n; @@ -4384,10 +4362,8 @@ int qemuMonitorJSONGetObjectTypes(qemuMonitorPtr mon, goto cleanup; } - if (!(typelist[i] = strdup(tmp))) { - virReportOOMError(); + if (VIR_STRDUP(typelist[i], tmp) < 0) goto cleanup; - } } ret = n; @@ -4466,10 +4442,8 @@ int qemuMonitorJSONGetObjectProps(qemuMonitorPtr mon, goto cleanup; } - if (!(proplist[i] = strdup(tmp))) { - virReportOOMError(); + if (VIR_STRDUP(proplist[i], tmp) < 0) goto cleanup; - } } ret = n; @@ -4520,10 +4494,7 @@ qemuMonitorJSONGetTargetArch(qemuMonitorPtr mon) goto cleanup; } - if (!(ret = strdup(arch))) { - virReportOOMError(); - goto cleanup; - } + ignore_value(VIR_STRDUP(ret, arch)); cleanup: virJSONValueFree(cmd); @@ -4817,10 +4788,8 @@ qemuMonitorJSONGetStringArray(qemuMonitorPtr mon, const char *qmpCmd, goto cleanup; } - if (!(list[i] = strdup(tmp))) { - virReportOOMError(); + if (VIR_STRDUP(list[i], tmp) < 0) goto cleanup; - } } ret = n; diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index 696961b..acc8a12 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -258,11 +258,8 @@ qemuMonitorTextCommandWithHandler(qemuMonitorPtr mon, if (msg.rxBuffer) { *reply = msg.rxBuffer; } else { - *reply = strdup(""); - if (!*reply) { - virReportOOMError(); + if (VIR_STRDUP(*reply, "") < 0) return -1; - } } } @@ -330,10 +327,8 @@ qemuMonitorSendDiskPassphrase(qemuMonitorPtr mon, /* Extra the path */ pathStart += strlen(DISK_ENCRYPTION_PREFIX); - if (!(path = strndup(pathStart, pathEnd - pathStart))) { - virReportOOMError(); + if (VIR_STRNDUP(path, pathStart, pathEnd - pathStart) < 0) return -1; - } /* Fetch the disk password if possible */ res = qemuMonitorGetDiskSecret(mon, @@ -2283,11 +2278,9 @@ int qemuMonitorTextGetPtyPaths(qemuMonitorPtr mon, /* Path is everything after needle to the end of the line */ *eol = '\0'; - char *path = strdup(needle + strlen(NEEDLE)); - if (path == NULL) { - virReportOOMError(); + char *path; + if (VIR_STRDUP(path, needle + strlen(NEEDLE)) < 0) goto cleanup; - } if (virHashAddEntry(paths, id, path) < 0) { virReportError(VIR_ERR_OPERATION_FAILED, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 3dd178c..2f2c92b 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1000,16 +1000,16 @@ qemuProcessHandleGraphics(qemuMonitorPtr mon ATTRIBUTE_UNUSED, if (VIR_ALLOC(localAddr) < 0) goto no_memory; localAddr->family = localFamily; - if (!(localAddr->service = strdup(localService)) || - !(localAddr->node = strdup(localNode))) - goto no_memory; + if (VIR_STRDUP(localAddr->service, localService) < 0 || + VIR_STRDUP(localAddr->node, localNode) < 0) + goto error; if (VIR_ALLOC(remoteAddr) < 0) goto no_memory; remoteAddr->family = remoteFamily; - if (!(remoteAddr->service = strdup(remoteService)) || - !(remoteAddr->node = strdup(remoteNode))) - goto no_memory; + if (VIR_STRDUP(remoteAddr->service, remoteService) < 0 || + VIR_STRDUP(remoteAddr->node, remoteNode) < 0) + goto error; if (VIR_ALLOC(subject) < 0) goto no_memory; @@ -1017,17 +1017,17 @@ qemuProcessHandleGraphics(qemuMonitorPtr mon ATTRIBUTE_UNUSED, if (VIR_REALLOC_N(subject->identities, subject->nidentity+1) < 0) goto no_memory; subject->nidentity++; - if (!(subject->identities[subject->nidentity-1].type = strdup("x509dname")) || - !(subject->identities[subject->nidentity-1].name = strdup(x509dname))) - goto no_memory; + if (VIR_STRDUP(subject->identities[subject->nidentity-1].type, "x509dname") < 0 || + VIR_STRDUP(subject->identities[subject->nidentity-1].name, x509dname) < 0) + goto error; } if (saslUsername) { if (VIR_REALLOC_N(subject->identities, subject->nidentity+1) < 0) goto no_memory; subject->nidentity++; - if (!(subject->identities[subject->nidentity-1].type = strdup("saslUsername")) || - !(subject->identities[subject->nidentity-1].name = strdup(saslUsername))) - goto no_memory; + if (VIR_STRDUP(subject->identities[subject->nidentity-1].type, "saslUsername") < 0 || + VIR_STRDUP(subject->identities[subject->nidentity-1].name, saslUsername) < 0) + goto error; } virObjectLock(vm); @@ -1041,6 +1041,7 @@ qemuProcessHandleGraphics(qemuMonitorPtr mon ATTRIBUTE_UNUSED, no_memory: virReportOOMError(); +error: if (localAddr) { VIR_FREE(localAddr->service); VIR_FREE(localAddr->node); @@ -1480,11 +1481,8 @@ qemuProcessExtractTTYPath(const char *haystack, */ while (*tmp) { if (c_isspace(*tmp)) { - *path = strndup(dev, tmp-dev); - if (*path == NULL) { - virReportOOMError(); + if (VIR_STRNDUP(*path, dev, tmp-dev) < 0) return -1; - } /* ... now further update offset till we get EOL */ *offset = tmp - haystack; @@ -1539,12 +1537,8 @@ qemuProcessLookupPTYs(virDomainChrDefPtr *devices, } VIR_FREE(chr->source.data.file.path); - chr->source.data.file.path = strdup(path); - - if (chr->source.data.file.path == NULL) { - virReportOOMError(); + if (VIR_STRDUP(chr->source.data.file.path, path) < 0) return -1; - } } } @@ -2666,12 +2660,12 @@ qemuProcessUpdateState(virQEMUDriverPtr driver, virDomainObjPtr vm) if (state == VIR_DOMAIN_PAUSED && running) { newState = VIR_DOMAIN_RUNNING; newReason = VIR_DOMAIN_RUNNING_UNPAUSED; - msg = strdup("was unpaused"); + ignore_value(VIR_STRDUP(msg, "was unpaused")); } else if (state == VIR_DOMAIN_RUNNING && !running) { if (reason == VIR_DOMAIN_PAUSED_SHUTTING_DOWN) { newState = VIR_DOMAIN_SHUTDOWN; newReason = VIR_DOMAIN_SHUTDOWN_UNKNOWN; - msg = strdup("shutdown"); + ignore_value(VIR_STRDUP(msg, "shutdown")); } else { newState = VIR_DOMAIN_PAUSED; newReason = reason; @@ -2681,7 +2675,7 @@ qemuProcessUpdateState(virQEMUDriverPtr driver, virDomainObjPtr vm) } else if (state == VIR_DOMAIN_SHUTOFF && running) { newState = VIR_DOMAIN_RUNNING; newReason = VIR_DOMAIN_RUNNING_BOOTED; - msg = strdup("finished booting"); + ignore_value(VIR_STRDUP(msg, "finished booting")); } if (newState != VIR_DOMAIN_NOSTATE) { @@ -3479,13 +3473,10 @@ int qemuProcessStart(virConnectPtr conn, goto cleanup; } graphics->listens[0].type = VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS; - if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) - graphics->listens[0].address = strdup(cfg->vncListen); - else - graphics->listens[0].address = strdup(cfg->spiceListen); - if (!graphics->listens[0].address) { + if (VIR_STRDUP(graphics->listens[0].address, + graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC ? + cfg->vncListen : cfg->spiceListen) < 0) { VIR_SHRINK_N(graphics->listens, graphics->nListens, 1); - virReportOOMError(); goto cleanup; } } @@ -4251,9 +4242,8 @@ int qemuProcessAttach(virConnectPtr conn ATTRIBUTE_UNUSED, } VIR_FREE(priv->pidfile); - if (pidfile && - !(priv->pidfile = strdup(pidfile))) - goto no_memory; + if (pidfile && VIR_STRDUP(priv->pidfile, pidfile) < 0) + goto cleanup; VIR_DEBUG("Detect security driver config"); sec_managers = virSecurityManagerGetNested(driver->securityManager); @@ -4274,11 +4264,11 @@ int qemuProcessAttach(virConnectPtr conn ATTRIBUTE_UNUSED, vm->def, vm->pid, seclabel) < 0) goto cleanup; - if (!(seclabeldef->model = strdup(model))) - goto no_memory; + if (VIR_STRDUP(seclabeldef->model, model) < 0) + goto cleanup; - if (!(seclabeldef->label = strdup(seclabel->label))) - goto no_memory; + if (VIR_STRDUP(seclabeldef->label, seclabel->label) < 0) + goto cleanup; VIR_FREE(seclabel); } diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 13212d0..97be2a0 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -3733,7 +3733,7 @@ static int remoteAuthMakeCredentials(sasl_interact_t *interact, } if (interact[*ncred].challenge) (*cred)[*ncred].challenge = interact[ninteract].challenge; - (*cred)[*ncred].prompt = interact[ninteract].prompt; + (*cred)[*ncred].prompt = (char *) interact[ninteract].prompt; if (interact[*ncred].defresult) (*cred)[*ncred].defresult = interact[ninteract].defresult; (*cred)[*ncred].result = NULL; -- 1.8.1.5

On 05/03/2013 08:53 AM, Michal Privoznik wrote: I think this file needs to be its own patch, because it has API considerations. More below. API change. Prior to this change, users passing a virConnectAuthCallbackPtr as part of their virConnectAuthPtr argument of virConnectOpenAuth could write that callback where they could modify the credential object passed to the callback. For example, I could do: int myCallback(virConnectCredentialPtr cred, unsigned int ncred, void *opaque) { cred->prompt = "new prompt"; return 0; } With your change, this will now fail to compile (attempt to assign a const char * into a char *). Granted, our documentation states that the callback writer should touch _only_ the result and resultlen field, but the fact that the user has to modify the incoming object at all means that the object itself has to declare which fields are input (with const) vs output. So I have no idea if someone writing such a callback handler is violating other aspects of code, and maybe our API break will never affect proper code; but at the same time, we make a strong promise of back-compat, and I'm reluctant to go back on that promise without strong reason. NACK to this change; API breaks are bad. Anywhere that we can't prep these fields using VIR_STRDUP (because VIR_STRDUP rightfully wants to assign to char*, not const char*), then we have to fix that code to do assignment in two parts (VIR_STRDUP into temporary char * var, then add const by assigning and/or casting into the callback struct we are populating). I need to look more at how these structs are used, but I have the same concern of an API break. (ABI-wise, it is still compatible). But since these two structs don't mix const and non-const char*, we might be able to get away with these changes. Sending now, to get my NACK out on the table, while I spend more time reviewing the rest of the patch. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

On 05/03/2013 08:53 AM, Michal Privoznik wrote: Part 3 - the qemu changes Seems like we could move some of this cleanup... ...here, so that we don't have a 'goto/return'. But that can be a separate patch (especially since you'll be revisiting VIR_REALLOC anyway). Can be simplified with NULL source. double-oom, but I'm assuming you'll clean it later. Can be simplified. Pre-existing, but space around '-' while touching this. Can be simplified. Space around '-' while touching this. Space around '+' while touching this You know, we could use strchrnul() here (guaranteed by gnulib)... Space around '-' ...then here, we could simplify things to always be a strndup (host2 would always be non-null, either because it hit ':' or the end of the string). This whole function could be simplified by doing the string parse with a bit more smarts. Spaces around '-' Another place where strchrnul probably helps. I'll quit pointing out spots where strchrnul might help - at this point converting to use strchrnul is worth splitting into a separate cleanup patch (whether before or after this patch, I don't know which is easier). Shoot. I ran out of time for today. What I've seen so far in qemu is looking okay, though. This one feels random (oh, it's associated with your proposed changes to libvirt.h, so it belongs to that patch, depending on what we decide there). -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

On 05/03/2013 08:53 AM, Michal Privoznik wrote: double-oom, but... ...you'll be making another pass anyway. ACK. There's also a lot of strdup() in src/remote/remote_client_bodies.h; you probably need to touch up src/rpc/gendispatch.pl to generate nicer code there. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

On 05/03/2013 08:53 AM, Michal Privoznik wrote: Ah, you DID notice the code generator, so that answers my comment on 18/34. Can simplify with NULL source. Correct use of VIR_STRDUP_QUIET here. Hmm - wonder if there is a pre-existing bug. If VIR_ALLOC succeeds but strdup fails, rerr->message points to a NULL pointer. The intent was that we _try_ to copy the string, but if it fails, we are okay for the RPC message to go out with a loss of information - but that should be done with rerr->message being a NULL pointer, not pointing to a NULL pointer. That is, I think this code should read: if (verr->message && VIR_ALLOC(rerr->message) == 0 && VIR_STRDUP_QUIET(*rerr->message, verr->message) < 0) VIR_FREE(rerr->message); Likewise for these three best-effort strings. And another case where I think we should free rerr->message if strdup fails. Can be simplified. Can be simplified. and again. Wonder if we should use virStringSplit instead of strsep(). Double-oom, unless you fix line 741 in virNetSSHAuthenticateKeyboardInteractive()'s switch statement to stop reporting oom when authCbErr says it has already been reported. Can be simplified, and merged in with previous 'if'. Can be simplified. and again. and again. ACK with minor cleanups. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

On 05/03/2013 08:53 AM, Michal Privoznik wrote: Nice and short! ACK. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

--- src/storage/parthelper.c | 5 ++--- src/storage/storage_backend.c | 22 ++++++---------------- src/storage/storage_backend_disk.c | 26 +++++++------------------- src/storage/storage_backend_fs.c | 34 ++++++++++------------------------ src/storage/storage_backend_iscsi.c | 17 ++++------------- src/storage/storage_backend_logical.c | 32 ++++++++++---------------------- src/storage/storage_backend_mpath.c | 5 +---- src/storage/storage_backend_rbd.c | 5 ++--- src/storage/storage_backend_scsi.c | 19 +++++++------------ src/storage/storage_backend_sheepdog.c | 6 +----- src/storage/storage_driver.c | 18 ++++++------------ 11 files changed, 56 insertions(+), 133 deletions(-) diff --git a/src/storage/parthelper.c b/src/storage/parthelper.c index c4af48f..038487a 100644 --- a/src/storage/parthelper.c +++ b/src/storage/parthelper.c @@ -44,6 +44,7 @@ #include "virutil.h" #include "c-ctype.h" #include "configmake.h" +#include "virstring.h" /* we don't need to include the full internal.h just for this */ #define STREQ(a,b) (strcmp(a,b) == 0) @@ -86,10 +87,8 @@ int main(int argc, char **argv) path = argv[1]; if (virIsDevMapperDevice(path)) { partsep = "p"; - canonical_path = strdup(path); - if (canonical_path == NULL) { + if (VIR_STRDUP_QUIET(canonical_path, path) < 0) return 2; - } } else { if (virFileResolveLink(path, &canonical_path) != 0) { return 2; diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index b85a5a9..7a728e0 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -486,11 +486,8 @@ virStorageGenerateQcowEncryption(virConnectPtr conn, goto cleanup; def->usage_type = VIR_SECRET_USAGE_TYPE_VOLUME; - def->usage.volume = strdup(vol->target.path); - if (def->usage.volume == NULL) { - virReportOOMError(); + if (VIR_STRDUP(def->usage.volume, vol->target.path) < 0) goto cleanup; - } xml = virSecretDefFormat(def); virSecretDefFree(def); def = NULL; @@ -1261,12 +1258,11 @@ virStorageBackendUpdateVolTargetInfoFD(virStorageVolTargetPtr target, target->perms.label = NULL; } } else { - target->perms.label = strdup(filecon); - freecon(filecon); - if (target->perms.label == NULL) { - virReportOOMError(); + if (VIR_STRDUP(target->perms.label, filecon) < 0) { + freecon(filecon); return -1; } + freecon(filecon); } #else target->perms.label = NULL; @@ -1451,10 +1447,7 @@ virStorageBackendStablePath(virStoragePoolObjPtr pool, * the original non-stable dev path */ - stablepath = strdup(devpath); - - if (stablepath == NULL) - virReportOOMError(); + ignore_value(VIR_STRDUP(stablepath, devpath)); return stablepath; } @@ -1556,11 +1549,8 @@ virStorageBackendRunProgRegex(virStoragePoolObjPtr pool, for (j = 0 ; j < nvars[i] ; j++) { /* NB vars[0] is the full pattern, so we offset j by 1 */ p[vars[j+1].rm_eo] = '\0'; - if ((groups[ngroup++] = - strdup(p + vars[j+1].rm_so)) == NULL) { - virReportOOMError(); + if (VIR_STRDUP(groups[ngroup++], p + vars[j+1].rm_so) < 0) goto cleanup; - } } /* We're matching on the last regex, so callback time */ diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backend_disk.c index 6da2d12..52bd572 100644 --- a/src/storage/storage_backend_disk.c +++ b/src/storage/storage_backend_disk.c @@ -66,17 +66,13 @@ virStorageBackendDiskMakeDataVol(virStoragePoolObjPtr pool, * strip the path to form a reasonable pool-unique name */ tmp = strrchr(groups[0], '/'); - if ((vol->name = strdup(tmp ? tmp + 1 : groups[0])) == NULL) { - virReportOOMError(); + if (VIR_STRDUP(vol->name, tmp ? tmp + 1 : groups[0]) < 0) return -1; - } } if (vol->target.path == NULL) { - if ((devpath = strdup(groups[0])) == NULL) { - virReportOOMError(); + if (VIR_STRDUP(devpath, groups[0]) < 0) return -1; - } /* Now figure out the stable path * @@ -92,10 +88,8 @@ virStorageBackendDiskMakeDataVol(virStoragePoolObjPtr pool, if (vol->key == NULL) { /* XXX base off a unique key of the underlying disk */ - if ((vol->key = strdup(vol->target.path)) == NULL) { - virReportOOMError(); + if (VIR_STRDUP(vol->key, vol->target.path) < 0) return -1; - } } if (vol->source.extents == NULL) { @@ -119,11 +113,9 @@ virStorageBackendDiskMakeDataVol(virStoragePoolObjPtr pool, return -1; } - if ((vol->source.extents[0].path = - strdup(pool->def->source.devices[0].path)) == NULL) { - virReportOOMError(); + if (VIR_STRDUP(vol->source.extents[0].path, + pool->def->source.devices[0].path) < 0) return -1; - } } /* Refresh allocation/capacity/perms */ @@ -485,10 +477,8 @@ virStorageBackendDiskPartFormat(virStoragePoolObjPtr pool, return -1; } } - if ((*partFormat = strdup(partedFormat)) == NULL) { - virReportOOMError(); + if (VIR_STRDUP(*partFormat, partedFormat) < 0) return -1; - } } else { /* create primary partition as long as it is possible and after that check if an extended partition exists @@ -527,10 +517,8 @@ virStorageBackendDiskPartFormat(virStoragePoolObjPtr pool, } } } else { - if ((*partFormat = strdup("primary")) == NULL) { - virReportOOMError(); + if (VIR_STRDUP(*partFormat, "primary") < 0) return -1; - } } return 0; } diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index 8288b1e..9b83e57 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -207,11 +207,9 @@ virStorageBackendFileSystemNetFindPoolSourcesFunc(virStoragePoolObjPtr pool ATTR } src->nhost = 1; - if (!(src->hosts[0].name = strdup(state->host)) || - !(src->dir = strdup(path))) { - virReportOOMError(); + if (VIR_STRDUP(src->hosts[0].name, state->host) < 0 || + VIR_STRDUP(src->dir, path) < 0) goto cleanup; - } src->format = VIR_STORAGE_POOL_NETFS_NFS; ret = 0; @@ -395,10 +393,8 @@ virStorageBackendFileSystemMount(virStoragePoolObjPtr pool) { } } else { - if ((src = strdup(pool->def->source.devices[0].path)) == NULL) { - virReportOOMError(); + if (VIR_STRDUP(src, pool->def->source.devices[0].path) < 0) return -1; - } } if (netauto) @@ -571,10 +567,8 @@ virStorageBackendFileSystemProbe(const char *device, goto error; } - if ((libblkid_format = strdup(format)) == NULL) { - virReportOOMError(); + if (VIR_STRDUP(libblkid_format, format) < 0) goto error; - } names[0] = libblkid_format; names[1] = NULL; @@ -749,10 +743,8 @@ virStorageBackendFileSystemBuild(virConnectPtr conn ATTRIBUTE_UNUSED, goto error; } - if ((parent = strdup(pool->def->target.path)) == NULL) { - virReportOOMError(); + if (VIR_STRDUP(parent, pool->def->target.path) < 0) goto error; - } if (!(p = strrchr(parent, '/'))) { virReportError(VIR_ERR_INVALID_ARG, _("path '%s' is not absolute"), @@ -833,8 +825,8 @@ virStorageBackendFileSystemRefresh(virConnectPtr conn ATTRIBUTE_UNUSED, if (VIR_ALLOC(vol) < 0) goto no_memory; - if ((vol->name = strdup(ent->d_name)) == NULL) - goto no_memory; + if (VIR_STRDUP(vol->name, ent->d_name) < 0) + goto cleanup; vol->type = VIR_STORAGE_VOL_FILE; vol->target.format = VIR_STORAGE_FILE_RAW; /* Real value is filled in during probe */ @@ -843,8 +835,8 @@ virStorageBackendFileSystemRefresh(virConnectPtr conn ATTRIBUTE_UNUSED, vol->name) == -1) goto no_memory; - if ((vol->key = strdup(vol->target.path)) == NULL) - goto no_memory; + if (VIR_STRDUP(vol->key, vol->target.path) < 0) + goto cleanup; if ((ret = virStorageBackendProbeTarget(&vol->target, &backingStore, @@ -1011,13 +1003,7 @@ virStorageBackendFileSystemVolCreate(virConnectPtr conn ATTRIBUTE_UNUSED, } VIR_FREE(vol->key); - vol->key = strdup(vol->target.path); - if (vol->key == NULL) { - virReportOOMError(); - return -1; - } - - return 0; + return VIR_STRDUP(vol->key, vol->target.path); } static int createFileDir(virConnectPtr conn ATTRIBUTE_UNUSED, diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_backend_iscsi.c index cf25919..a38f6ff 100644 --- a/src/storage/storage_backend_iscsi.c +++ b/src/storage/storage_backend_iscsi.c @@ -125,13 +125,8 @@ virStorageBackendISCSIExtractSession(virStoragePoolObjPtr pool, { char **session = data; - if (STREQ(groups[1], pool->def->source.devices[0].path)) { - if ((*session = strdup(groups[0])) == NULL) { - virReportOOMError(); - return -1; - } - } - + if (STREQ(groups[1], pool->def->source.devices[0].path)) + return VIR_STRDUP(*session, groups[0]); return 0; } @@ -247,10 +242,8 @@ virStorageBackendIQNFound(const char *initiatoriqn, "of '%s'"), ISCSIADM); goto out; } - *ifacename = strndup(line, token - line); - if (*ifacename == NULL) { + if (VIR_STRNDUP(*ifacename, line, token - line) < 0) { ret = IQN_ERROR; - virReportOOMError(); goto out; } VIR_DEBUG("Found interface '%s' with IQN '%s'", *ifacename, iqn); @@ -499,10 +492,8 @@ virStorageBackendISCSIGetTargets(virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, struct virStorageBackendISCSITargetList *list = data; char *target; - if (!(target = strdup(groups[1]))) { - virReportOOMError(); + if (VIR_STRDUP(target, groups[1]) < 0) return -1; - } if (VIR_REALLOC_N(list->targets, list->ntargets + 1) < 0) { VIR_FREE(target); diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index 316043f..aceb650 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -100,10 +100,8 @@ virStorageBackendLogicalMakeVol(virStoragePoolObjPtr pool, is_new_vol = true; vol->type = VIR_STORAGE_VOL_BLOCK; - if ((vol->name = strdup(groups[0])) == NULL) { - virReportOOMError(); + if (VIR_STRDUP(vol->name, groups[0]) < 0) goto cleanup; - } if (VIR_REALLOC_N(pool->volumes.objs, pool->volumes.count + 1)) { @@ -137,11 +135,8 @@ virStorageBackendLogicalMakeVol(virStoragePoolObjPtr pool, vol->backingStore.format = VIR_STORAGE_POOL_LOGICAL_LVM2; } - if (vol->key == NULL && - (vol->key = strdup(groups[2])) == NULL) { - virReportOOMError(); + if (!vol->key && VIR_STRDUP(vol->key, groups[2]) < 0) goto cleanup; - } if (virStorageBackendUpdateVolInfo(vol, 1) < 0) goto cleanup; @@ -179,7 +174,8 @@ virStorageBackendLogicalMakeVol(virStoragePoolObjPtr pool, } /* Now parse the "devices" field separately */ - regex = strdup(regex_unit); + if (VIR_STRDUP(regex, regex_unit) < 0) + goto cleanup; for (i = 1; i < nextents; i++) { if (VIR_REALLOC_N(regex, strlen(regex) + strlen(regex_unit) + 2) < 0) { @@ -229,23 +225,19 @@ virStorageBackendLogicalMakeVol(virStoragePoolObjPtr pool, /* vars[0] is skipped */ for (i = 0; i < nextents; i++) { int j, len; - const char *offset_str = NULL; + char *offset_str = NULL; j = (i * 2) + 1; len = vars[j].rm_eo - vars[j].rm_so; p[vars[j].rm_eo] = '\0'; - if ((vol->source.extents[vol->source.nextent].path = - strndup(p + vars[j].rm_so, len)) == NULL) { - virReportOOMError(); + if (VIR_STRNDUP(vol->source.extents[vol->source.nextent].path, + p + vars[j].rm_so, len) < 0) goto cleanup; - } len = vars[j + 1].rm_eo - vars[j + 1].rm_so; - if (!(offset_str = strndup(p + vars[j + 1].rm_so, len))) { - virReportOOMError(); + if (VIR_STRNDUP(offset_str, p + vars[j + 1].rm_so, len) < 0) goto cleanup; - } if (virStrToLong_ull(offset_str, NULL, 10, &offset) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -358,13 +350,9 @@ virStorageBackendLogicalFindPoolSourcesFunc(virStoragePoolObjPtr pool ATTRIBUTE_ virStoragePoolSourceDevicePtr dev; virStoragePoolSource *thisSource; - pvname = strdup(groups[0]); - vgname = strdup(groups[1]); - - if (pvname == NULL || vgname == NULL) { - virReportOOMError(); + if (VIR_STRDUP(pvname, groups[0]) < 0 || + VIR_STRDUP(vgname, groups[1]) < 0) goto err_no_memory; - } thisSource = NULL; for (i = 0 ; i < sourceList->nsources; i++) { diff --git a/src/storage/storage_backend_mpath.c b/src/storage/storage_backend_mpath.c index 6e742f7..357c346 100644 --- a/src/storage/storage_backend_mpath.c +++ b/src/storage/storage_backend_mpath.c @@ -99,11 +99,8 @@ virStorageBackendMpathNewVol(virStoragePoolObjPtr pool, } /* XXX should use logical unit's UUID instead */ - vol->key = strdup(vol->target.path); - if (vol->key == NULL) { - virReportOOMError(); + if (VIR_STRDUP(vol->key, vol->target.path) < 0) goto cleanup; - } if (VIR_REALLOC_N(pool->volumes.objs, pool->volumes.count + 1) < 0) { diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index 99024e3..953a8ee 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -334,10 +334,9 @@ static int virStorageBackendRBDRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED, if (VIR_ALLOC(vol) < 0) goto out_of_memory; - vol->name = strdup(name); - if (vol->name == NULL) { + if (VIR_STRDUP(vol->name, name) < 0) { VIR_FREE(vol); - goto out_of_memory; + goto cleanup; } name += strlen(name) + 1; diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backend_scsi.c index 154a56a..bd6a2a9 100644 --- a/src/storage/storage_backend_scsi.c +++ b/src/storage/storage_backend_scsi.c @@ -188,8 +188,7 @@ virStorageBackendSCSISerial(const char *dev) *nl = '\0'; } else { VIR_FREE(serial); - if (!(serial = strdup(dev))) - virReportOOMError(); + ignore_value(VIR_STRDUP(serial, dev)); } #ifdef WITH_UDEV @@ -333,10 +332,7 @@ getNewStyleBlockDevice(const char *lun_path, continue; } - *block_device = strdup(block_dirent->d_name); - - if (*block_device == NULL) { - virReportOOMError(); + if (VIR_STRDUP(*block_device, block_dirent->d_name) < 0) { closedir(block_dir); retval = -1; goto out; @@ -373,10 +369,7 @@ getOldStyleBlockDevice(const char *lun_path ATTRIBUTE_UNUSED, retval = -1; } else { blockp++; - *block_device = strdup(blockp); - - if (*block_device == NULL) { - virReportOOMError(); + if (VIR_STRDUP(*block_device, blockp) < 0) { retval = -1; goto out; } @@ -630,8 +623,10 @@ getAdapterName(virStoragePoolSourceAdapter adapter) { char *name = NULL; - if (adapter.type != VIR_STORAGE_POOL_SOURCE_ADAPTER_TYPE_FC_HOST) - return strdup(adapter.data.name); + if (adapter.type != VIR_STORAGE_POOL_SOURCE_ADAPTER_TYPE_FC_HOST) { + ignore_value(VIR_STRDUP(name, adapter.data.name)); + return name; + } if (!(name = virGetFCHostNameByWWN(NULL, adapter.data.fchost.wwnn, diff --git a/src/storage/storage_backend_sheepdog.c b/src/storage/storage_backend_sheepdog.c index 2e62e6d..b4d7b8e 100644 --- a/src/storage/storage_backend_sheepdog.c +++ b/src/storage/storage_backend_sheepdog.c @@ -269,11 +269,7 @@ virStorageBackendSheepdogRefreshVol(virConnectPtr conn ATTRIBUTE_UNUSED, } VIR_FREE(vol->target.path); - if (!(vol->target.path = strdup(vol->name))) { - virReportOOMError(); - goto cleanup; - } - + ignore_value(VIR_STRDUP(vol->target.path, vol->name)); cleanup: virCommandFree(cmd); return ret; diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 990f0b1..7cf8193 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -144,8 +144,8 @@ storageStateInitialize(bool privileged, storageDriverLock(driverState); if (privileged) { - if ((base = strdup(SYSCONFDIR "/libvirt")) == NULL) - goto out_of_memory; + if (VIR_STRDUP(base, SYSCONFDIR "/libvirt") < 0) + goto error; } else { base = virGetUserConfigDirectory(); if (!base) @@ -336,9 +336,8 @@ storageConnectListStoragePools(virConnectPtr conn, for (i = 0 ; i < driver->pools.count && got < nnames ; i++) { virStoragePoolObjLock(driver->pools.objs[i]); if (virStoragePoolObjIsActive(driver->pools.objs[i])) { - if (!(names[got] = strdup(driver->pools.objs[i]->def->name))) { + if (VIR_STRDUP(names[got], driver->pools.objs[i]->def->name) < 0) { virStoragePoolObjUnlock(driver->pools.objs[i]); - virReportOOMError(); goto cleanup; } got++; @@ -384,9 +383,8 @@ storageConnectListDefinedStoragePools(virConnectPtr conn, for (i = 0 ; i < driver->pools.count && got < nnames ; i++) { virStoragePoolObjLock(driver->pools.objs[i]); if (!virStoragePoolObjIsActive(driver->pools.objs[i])) { - if (!(names[got] = strdup(driver->pools.objs[i]->def->name))) { + if (VIR_STRDUP(names[got], driver->pools.objs[i]->def->name) < 0) { virStoragePoolObjUnlock(driver->pools.objs[i]); - virReportOOMError(); goto cleanup; } got++; @@ -1117,10 +1115,8 @@ storagePoolListVolumes(virStoragePoolPtr obj, } for (i = 0 ; i < pool->volumes.count && n < maxnames ; i++) { - if ((names[n++] = strdup(pool->volumes.objs[i]->name)) == NULL) { - virReportOOMError(); + if (VIR_STRDUP(names[n++], pool->volumes.objs[i]->name) < 0) goto cleanup; - } } virStoragePoolObjUnlock(pool); @@ -2340,9 +2336,7 @@ storageVolGetPath(virStorageVolPtr obj) { goto cleanup; } - ret = strdup(vol->target.path); - if (ret == NULL) - virReportOOMError(); + ignore_value(VIR_STRDUP(ret, vol->target.path)); cleanup: if (pool) -- 1.8.1.5

--- src/test/test_driver.c | 144 ++++++++++++++++++------------------------------- 1 file changed, 52 insertions(+), 92 deletions(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index f60f106..32b200c 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -219,18 +219,17 @@ testBuildCapabilities(virConnectPtr conn) { caps->host.nsecModels = 1; if (VIR_ALLOC_N(caps->host.secModels, caps->host.nsecModels) < 0) goto no_memory; - caps->host.secModels[0].model = strdup("testSecurity"); - if (!caps->host.secModels[0].model) - goto no_memory; + if (VIR_STRDUP(caps->host.secModels[0].model, "testSecurity") < 0) + goto error; - caps->host.secModels[0].doi = strdup(""); - if (!caps->host.secModels[0].doi) - goto no_memory; + if (VIR_STRDUP(caps->host.secModels[0].doi, "") < 0) + goto error; return caps; no_memory: virReportOOMError(); +error: virObjectUnref(caps); return NULL; } @@ -673,10 +672,14 @@ static char *testBuildFilename(const char *relativeTo, const char *filename) { char *offset; int baseLen; + char *ret; + if (!filename || filename[0] == '\0') return NULL; - if (filename[0] == '/') - return strdup(filename); + if (filename[0] == '/') { + ignore_value(VIR_STRDUP(ret, filename)); + return ret; + } offset = strrchr(relativeTo, '/'); if ((baseLen = (offset-relativeTo+1))) { @@ -691,7 +694,8 @@ static char *testBuildFilename(const char *relativeTo, strcat(absFile, filename); return absFile; } else { - return strdup(filename); + ignore_value(VIR_STRDUP(ret, filename)); + return ret; } } @@ -754,13 +758,8 @@ static int testOpenVolumesForPool(xmlDocPtr xml, } } - if (def->key == NULL) { - def->key = strdup(def->target.path); - if (def->key == NULL) { - virReportOOMError(); - goto error; - } - } + if (!def->key && VIR_STRDUP(def->key, def->target.path) < 0) + goto error; pool->def->allocation += def->allocation; pool->def->available = (pool->def->capacity - @@ -826,10 +825,8 @@ static int testOpenFromFile(virConnectPtr conn, privconn->nextDomID = 1; privconn->numCells = 0; - if ((privconn->path = strdup(file)) == NULL) { - virReportOOMError(); + if (VIR_STRDUP(privconn->path, file) < 0) goto error; - } memmove(&privconn->nodeInfo, &defaultNodeInfo, sizeof(defaultNodeInfo)); nodeInfo = &privconn->nodeInfo; @@ -2060,9 +2057,9 @@ cleanup: } static char *testDomainGetOSType(virDomainPtr dom ATTRIBUTE_UNUSED) { - char *ret = strdup("linux"); - if (!ret) - virReportOOMError(); + char *ret; + + ignore_value(VIR_STRDUP_QUIET(ret, "linux")); return ret; } @@ -2720,9 +2717,7 @@ static char *testDomainGetSchedulerType(virDomainPtr domain ATTRIBUTE_UNUSED, if (nparams) *nparams = 1; - type = strdup("fair"); - if (!type) - virReportOOMError(); + ignore_value(VIR_STRDUP_QUIET(type, "fair")); return type; } @@ -3020,9 +3015,9 @@ static int testConnectListNetworks(virConnectPtr conn, char **const names, int n for (i = 0 ; i < privconn->networks.count && n < nnames ; i++) { virNetworkObjLock(privconn->networks.objs[i]); if (virNetworkObjIsActive(privconn->networks.objs[i]) && - !(names[n++] = strdup(privconn->networks.objs[i]->def->name))) { + VIR_STRDUP(names[n++], privconn->networks.objs[i]->def->name) < 0) { virNetworkObjUnlock(privconn->networks.objs[i]); - goto no_memory; + goto error; } virNetworkObjUnlock(privconn->networks.objs[i]); } @@ -3030,8 +3025,7 @@ static int testConnectListNetworks(virConnectPtr conn, char **const names, int n return n; -no_memory: - virReportOOMError(); +error: for (n = 0 ; n < nnames ; n++) VIR_FREE(names[n]); testDriverUnlock(privconn); @@ -3063,9 +3057,9 @@ static int testConnectListDefinedNetworks(virConnectPtr conn, char **const names for (i = 0 ; i < privconn->networks.count && n < nnames ; i++) { virNetworkObjLock(privconn->networks.objs[i]); if (!virNetworkObjIsActive(privconn->networks.objs[i]) && - !(names[n++] = strdup(privconn->networks.objs[i]->def->name))) { + VIR_STRDUP(names[n++], privconn->networks.objs[i]->def->name) < 0) { virNetworkObjUnlock(privconn->networks.objs[i]); - goto no_memory; + goto error; } virNetworkObjUnlock(privconn->networks.objs[i]); } @@ -3073,8 +3067,7 @@ static int testConnectListDefinedNetworks(virConnectPtr conn, char **const names return n; -no_memory: - virReportOOMError(); +error: for (n = 0 ; n < nnames ; n++) VIR_FREE(names[n]); testDriverUnlock(privconn); @@ -3381,10 +3374,7 @@ static char *testNetworkGetBridgeName(virNetworkPtr network) { goto cleanup; } - if (!(bridge = strdup(privnet->def->bridge))) { - virReportOOMError(); - goto cleanup; - } + ignore_value(VIR_STRDUP(bridge, privnet->def->bridge)); cleanup: if (privnet) @@ -3494,9 +3484,9 @@ static int testConnectListInterfaces(virConnectPtr conn, char **const names, int for (i = 0 ; (i < privconn->ifaces.count) && (n < nnames); i++) { virInterfaceObjLock(privconn->ifaces.objs[i]); if (virInterfaceObjIsActive(privconn->ifaces.objs[i])) { - if (!(names[n++] = strdup(privconn->ifaces.objs[i]->def->name))) { + if (VIR_STRDUP(names[n++], privconn->ifaces.objs[i]->def->name) < 0) { virInterfaceObjUnlock(privconn->ifaces.objs[i]); - goto no_memory; + goto error; } } virInterfaceObjUnlock(privconn->ifaces.objs[i]); @@ -3505,8 +3495,7 @@ static int testConnectListInterfaces(virConnectPtr conn, char **const names, int return n; -no_memory: - virReportOOMError(); +error: for (n = 0 ; n < nnames ; n++) VIR_FREE(names[n]); testDriverUnlock(privconn); @@ -3540,9 +3529,9 @@ static int testConnectListDefinedInterfaces(virConnectPtr conn, char **const nam for (i = 0 ; (i < privconn->ifaces.count) && (n < nnames); i++) { virInterfaceObjLock(privconn->ifaces.objs[i]); if (!virInterfaceObjIsActive(privconn->ifaces.objs[i])) { - if (!(names[n++] = strdup(privconn->ifaces.objs[i]->def->name))) { + if (VIR_STRDUP(names[n++], privconn->ifaces.objs[i]->def->name) < 0) { virInterfaceObjUnlock(privconn->ifaces.objs[i]); - goto no_memory; + goto error; } } virInterfaceObjUnlock(privconn->ifaces.objs[i]); @@ -3551,7 +3540,7 @@ static int testConnectListDefinedInterfaces(virConnectPtr conn, char **const nam return n; -no_memory: +error: virReportOOMError(); for (n = 0 ; n < nnames ; n++) VIR_FREE(names[n]); @@ -3880,13 +3869,7 @@ static int testStoragePoolObjSetDefaults(virStoragePoolObjPtr pool) { pool->def->allocation = defaultPoolAlloc; pool->def->available = defaultPoolCap - defaultPoolAlloc; - pool->configFile = strdup("\0"); - if (!pool->configFile) { - virReportOOMError(); - return -1; - } - - return 0; + return VIR_STRDUP(pool->configFile, "\0"); } static virDrvOpenStatus testStorageOpen(virConnectPtr conn, @@ -3989,9 +3972,9 @@ testConnectListStoragePools(virConnectPtr conn, for (i = 0 ; i < privconn->pools.count && n < nnames ; i++) { virStoragePoolObjLock(privconn->pools.objs[i]); if (virStoragePoolObjIsActive(privconn->pools.objs[i]) && - !(names[n++] = strdup(privconn->pools.objs[i]->def->name))) { + VIR_STRDUP(names[n++], privconn->pools.objs[i]->def->name) < 0) { virStoragePoolObjUnlock(privconn->pools.objs[i]); - goto no_memory; + goto error; } virStoragePoolObjUnlock(privconn->pools.objs[i]); } @@ -3999,8 +3982,7 @@ testConnectListStoragePools(virConnectPtr conn, return n; -no_memory: - virReportOOMError(); +error: for (n = 0 ; n < nnames ; n++) VIR_FREE(names[n]); testDriverUnlock(privconn); @@ -4036,9 +4018,9 @@ testConnectListDefinedStoragePools(virConnectPtr conn, for (i = 0 ; i < privconn->pools.count && n < nnames ; i++) { virStoragePoolObjLock(privconn->pools.objs[i]); if (!virStoragePoolObjIsActive(privconn->pools.objs[i]) && - !(names[n++] = strdup(privconn->pools.objs[i]->def->name))) { + VIR_STRDUP(names[n++], privconn->pools.objs[i]->def->name) < 0) { virStoragePoolObjUnlock(privconn->pools.objs[i]); - goto no_memory; + goto error; } virStoragePoolObjUnlock(privconn->pools.objs[i]); } @@ -4046,8 +4028,7 @@ testConnectListDefinedStoragePools(virConnectPtr conn, return n; -no_memory: - virReportOOMError(); +error: for (n = 0 ; n < nnames ; n++) VIR_FREE(names[n]); testDriverUnlock(privconn); @@ -4178,9 +4159,7 @@ testConnectFindStoragePoolSources(virConnectPtr conn ATTRIBUTE_UNUSED, switch (pool_type) { case VIR_STORAGE_POOL_LOGICAL: - ret = strdup(defaultPoolSourcesLogicalXML); - if (!ret) - virReportOOMError(); + ignore_value(VIR_STRDUP(ret, defaultPoolSourcesLogicalXML)); break; case VIR_STORAGE_POOL_NETFS: @@ -4648,10 +4627,8 @@ testStoragePoolListVolumes(virStoragePoolPtr pool, } for (i = 0 ; i < privpool->volumes.count && n < maxnames ; i++) { - if ((names[n++] = strdup(privpool->volumes.objs[i]->name)) == NULL) { - virReportOOMError(); + if (VIR_STRDUP(names[n++], privpool->volumes.objs[i]->name) < 0) goto cleanup; - } } virStoragePoolObjUnlock(privpool); @@ -4910,11 +4887,8 @@ testStorageVolCreateXML(virStoragePoolPtr pool, goto cleanup; } - privvol->key = strdup(privvol->target.path); - if (privvol->key == NULL) { - virReportOOMError(); + if (VIR_STRDUP(privvol->key, privvol->target.path) < 0) goto cleanup; - } privpool->def->allocation += privvol->allocation; privpool->def->available = (privpool->def->capacity - @@ -5005,11 +4979,8 @@ testStorageVolCreateXMLFrom(virStoragePoolPtr pool, goto cleanup; } - privvol->key = strdup(privvol->target.path); - if (privvol->key == NULL) { - virReportOOMError(); + if (VIR_STRDUP(privvol->key, privvol->target.path) < 0) goto cleanup; - } privpool->def->allocation += privvol->allocation; privpool->def->available = (privpool->def->capacity - @@ -5233,9 +5204,7 @@ testStorageVolGetPath(virStorageVolPtr vol) { goto cleanup; } - ret = strdup(privvol->target.path); - if (ret == NULL) - virReportOOMError(); + ignore_value(VIR_STRDUP_QUIET(ret, privvol->target.path)); cleanup: if (privpool) @@ -5302,7 +5271,7 @@ testNodeListDevices(virConnectPtr conn, virNodeDeviceObjLock(driver->devs.objs[i]); if (cap == NULL || virNodeDeviceHasCap(driver->devs.objs[i], cap)) { - if ((names[ndevs++] = strdup(driver->devs.objs[i]->def->name)) == NULL) { + if (VIR_STRDUP(names[ndevs++], driver->devs.objs[i]->def->name) < 0) { virNodeDeviceObjUnlock(driver->devs.objs[i]); goto failure; } @@ -5393,9 +5362,7 @@ testNodeDeviceGetParent(virNodeDevicePtr dev) } if (obj->def->parent) { - ret = strdup(obj->def->parent); - if (!ret) - virReportOOMError(); + ignore_value(VIR_STRDUP_QUIET(ret, obj->def->parent)); } else { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("no parent for this device")); @@ -5460,9 +5427,9 @@ testNodeDeviceListCaps(virNodeDevicePtr dev, char **const names, int maxnames) } for (caps = obj->def->caps; caps && ncaps < maxnames; caps = caps->next) { - names[ncaps] = strdup(virNodeDevCapTypeToString(caps->type)); - if (names[ncaps++] == NULL) + if (VIR_STRDUP(names[ncaps], virNodeDevCapTypeToString(caps->type)) < 0) goto cleanup; + ncaps++; } ret = ncaps; @@ -5514,10 +5481,8 @@ testNodeDeviceCreateXML(virConnectPtr conn, /* 'name' is supposed to be filled in by the node device backend, which * we don't have. Use WWPN instead. */ VIR_FREE(def->name); - if (!(def->name = strdup(wwpn))) { - virReportOOMError(); + if (VIR_STRDUP(def->name, wwpn) < 0) goto cleanup; - } /* Fill in a random 'host' value, since this would also come from * the backend */ @@ -5568,11 +5533,8 @@ testNodeDeviceDestroy(virNodeDevicePtr dev) goto out; } - parent_name = strdup(obj->def->parent); - if (parent_name == NULL) { - virReportOOMError(); + if (VIR_STRDUP(parent_name, obj->def->parent) < 0) goto out; - } /* virNodeDeviceGetParentHost will cause the device object's lock to be * taken, so we have to dup the parent's name and drop the lock @@ -5778,10 +5740,8 @@ testDomainScreenshot(virDomainPtr dom ATTRIBUTE_UNUSED, virCheckFlags(0, NULL); - if (!(ret = strdup("image/png"))) { - virReportOOMError(); + if (VIR_STRDUP(ret, "image/png") < 0) return NULL; - } if (virFDStreamOpenFile(st, PKGDATADIR "/libvirtLogo.png", 0, 0, O_RDONLY < 0)) VIR_FREE(ret); -- 1.8.1.5

--- src/uml/uml_conf.c | 10 ++++------ src/uml/uml_driver.c | 8 +++----- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/uml/uml_conf.c b/src/uml/uml_conf.c index a55b5b1..52b705c 100644 --- a/src/uml/uml_conf.c +++ b/src/uml/uml_conf.c @@ -114,8 +114,8 @@ umlConnectTapDevice(virConnectPtr conn, STRPREFIX(net->ifname, VIR_NET_GENERATED_PREFIX) || strchr(net->ifname, '%')) { VIR_FREE(net->ifname); - if (!(net->ifname = strdup(VIR_NET_GENERATED_PREFIX "%d"))) - goto no_memory; + if (VIR_STRDUP(net->ifname, VIR_NET_GENERATED_PREFIX "%d") < 0) + goto error; /* avoid exposing vnet%d in getXMLDesc or error outputs */ template_ifname = true; } @@ -141,8 +141,6 @@ umlConnectTapDevice(virConnectPtr conn, return 0; -no_memory: - virReportOOMError(); error: return -1; } @@ -463,8 +461,8 @@ virCommandPtr umlBuildCommandLine(virConnectPtr conn, if (vm->def->os.cmdline) { char *args, *next_arg; char *cmdline; - if ((cmdline = strdup(vm->def->os.cmdline)) == NULL) - goto no_memory; + if (VIR_STRDUP(cmdline, vm->def->os.cmdline) < 0) + goto error; args = cmdline; while (*args == ' ') diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index 66c00b2..c658a42 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -248,8 +248,7 @@ requery: if (res && STRPREFIX(res, "pts:")) { VIR_FREE(def->source.data.file.path); - if ((def->source.data.file.path = strdup(res + 4)) == NULL) { - virReportOOMError(); + if (VIR_STRDUP(def->source.data.file.path, res + 4) < 0) { VIR_FREE(res); VIR_FREE(cmd); return -1; @@ -491,7 +490,7 @@ umlStateInitialize(bool privileged, "%s/log/libvirt/uml", LOCALSTATEDIR) == -1) goto out_of_memory; - if ((base = strdup(SYSCONFDIR "/libvirt")) == NULL) + if (VIR_STRDUP_QUIET(base, SYSCONFDIR "/libvirt") < 0) goto out_of_memory; if (virAsprintf(&uml_driver->monitorDir, @@ -1665,8 +1664,7 @@ static char *umlDomainGetOSType(virDomainPtr dom) { goto cleanup; } - if (!(type = strdup(vm->def->os.type))) - virReportOOMError(); + ignore_value(VIR_STRDUP(type, vm->def->os.type)); cleanup: if (vm) -- 1.8.1.5

--- src/util/virauth.c | 17 +-- src/util/virauthconfig.c | 8 +- src/util/virbitmap.c | 9 +- src/util/vircgroup.c | 36 ++--- src/util/vircommand.c | 33 ++--- src/util/virconf.c | 34 ++--- src/util/virdnsmasq.c | 22 +-- src/util/virebtables.c | 34 ++--- src/util/virebtables.h | 2 +- src/util/virerror.c | 19 +-- src/util/virhash.c | 5 +- src/util/viridentity.c | 15 +- src/util/virinitctl.c | 4 +- src/util/viriptables.c | 4 +- src/util/virjson.c | 18 ++- src/util/virkeyfile.c | 13 +- src/util/virlockspace.c | 25 ++-- src/util/virlog.c | 25 ++-- src/util/virnetdevmacvlan.c | 16 +-- src/util/virnetdevtap.c | 11 +- src/util/virnetdevvportprofile.c | 4 +- src/util/virobject.c | 16 ++- src/util/virpci.c | 14 +- src/util/virsexpr.c | 37 ++--- src/util/virsocketaddr.c | 9 +- src/util/virstoragefile.c | 18 +-- src/util/virstring.c | 17 +-- src/util/virsysinfo.c | 290 ++++++++++++++++----------------------- src/util/virtypedparam.c | 14 +- src/util/viruri.c | 58 ++++---- src/util/virutil.c | 91 +++++------- src/util/virxml.c | 5 +- 32 files changed, 356 insertions(+), 567 deletions(-) diff --git a/src/util/virauth.c b/src/util/virauth.c index fdcefe1..0888c37 100644 --- a/src/util/virauth.c +++ b/src/util/virauth.c @@ -51,8 +51,8 @@ int virAuthGetConfigFilePath(virConnectPtr conn, if (authenv) { VIR_DEBUG("Using path from env '%s'", authenv); - if (!(*path = strdup(authenv))) - goto no_memory; + if (VIR_STRDUP(*path, authenv) < 0) + goto cleanup; return 0; } @@ -62,8 +62,8 @@ int virAuthGetConfigFilePath(virConnectPtr conn, conn->uri->params[i].value) { VIR_DEBUG("Using path from URI '%s'", conn->uri->params[i].value); - if (!(*path = strdup(conn->uri->params[i].value))) - goto no_memory; + if (VIR_STRDUP(*path, conn->uri->params[i].value) < 0) + goto cleanup; return 0; } } @@ -81,8 +81,8 @@ int virAuthGetConfigFilePath(virConnectPtr conn, VIR_FREE(*path); - if (!(*path = strdup(SYSCONFDIR "/libvirt/auth.conf"))) - goto no_memory; + if (VIR_STRDUP(*path, SYSCONFDIR "/libvirt/auth.conf") < 0) + goto cleanup; VIR_DEBUG("Checking for readability of '%s'", *path); if (access(*path, R_OK) == 0) @@ -136,11 +136,8 @@ virAuthGetCredential(virConnectPtr conn, &tmp) < 0) goto cleanup; - if (tmp && - !(*value = strdup(tmp))) { - virReportOOMError(); + if (tmp && VIR_STRDUP(*value, tmp) < 0) goto cleanup; - } ret = 0; diff --git a/src/util/virauthconfig.c b/src/util/virauthconfig.c index 4259cb3..c9f6046 100644 --- a/src/util/virauthconfig.c +++ b/src/util/virauthconfig.c @@ -47,10 +47,8 @@ virAuthConfigPtr virAuthConfigNew(const char *path) goto error; } - if (!(auth->path = strdup(path))) { - virReportOOMError(); + if (VIR_STRDUP(auth->path, path) < 0) goto error; - } if (!(auth->keyfile = virKeyFileNew())) goto error; @@ -77,10 +75,8 @@ virAuthConfigPtr virAuthConfigNewData(const char *path, goto error; } - if (!(auth->path = strdup(path))) { - virReportOOMError(); + if (VIR_STRDUP(auth->path, path) < 0) goto error; - } if (!(auth->keyfile = virKeyFileNew())) goto error; diff --git a/src/util/virbitmap.c b/src/util/virbitmap.c index c81555a..cf6a099 100644 --- a/src/util/virbitmap.c +++ b/src/util/virbitmap.c @@ -37,6 +37,8 @@ #include "count-one-bits.h" #include "virstring.h" +#define VIR_FROM_THIS VIR_FROM_NONE + struct _virBitmap { size_t max_bit; size_t map_len; @@ -226,8 +228,11 @@ char *virBitmapFormat(virBitmapPtr bitmap) return NULL; cur = virBitmapNextSetBit(bitmap, -1); - if (cur < 0) - return strdup(""); + if (cur < 0) { + char *ret; + ignore_value(VIR_STRDUP(ret, "")); + return ret; + } start = prev = cur; while (prev >= 0) { diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 473d2fc..b3845ea 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -116,19 +116,14 @@ static int virCgroupCopyMounts(virCgroupPtr group, if (!parent->controllers[i].mountPoint) continue; - group->controllers[i].mountPoint = - strdup(parent->controllers[i].mountPoint); - - if (!group->controllers[i].mountPoint) + if (VIR_STRDUP(group->controllers[i].mountPoint, + parent->controllers[i].mountPoint) < 0) return -ENOMEM; - if (parent->controllers[i].linkPoint) { - group->controllers[i].linkPoint = - strdup(parent->controllers[i].linkPoint); - - if (!group->controllers[i].linkPoint) - return -ENOMEM; - } + if (parent->controllers[i].linkPoint && + VIR_STRDUP(group->controllers[i].linkPoint, + parent->controllers[i].linkPoint) < 0) + return -ENOMEM; } return 0; } @@ -177,8 +172,8 @@ static int virCgroupDetectMounts(virCgroupPtr group) struct stat sb; char *tmp2; - if (!(group->controllers[i].mountPoint = strdup(entry.mnt_dir))) - goto no_memory; + if (VIR_STRDUP(group->controllers[i].mountPoint, entry.mnt_dir) < 0) + goto error; tmp2 = strrchr(entry.mnt_dir, '/'); if (!tmp2) { @@ -239,7 +234,7 @@ static int virCgroupCopyPlacement(virCgroupPtr group, continue; if (path[0] == '/') { - if (!(group->controllers[i].placement = strdup(path))) + if (VIR_STRDUP(group->controllers[i].placement, path) < 0) return -ENOMEM; } else { /* @@ -821,7 +816,7 @@ static int virCgroupNew(const char *path, } if (path[0] == '/' || !parent) { - if (!((*group)->path = strdup(path))) { + if (VIR_STRDUP((*group)->path, path) < 0) { rc = -ENOMEM; goto err; } @@ -1027,7 +1022,7 @@ static int virCgroupAddTaskStrController(virCgroupPtr group, int rc = 0; char *endp; - if (!(str = strdup(pidstr))) + if (VIR_STRDUP(str, pidstr) < 0) return -1; cur = str; @@ -1253,7 +1248,7 @@ int virCgroupNewPartition(const char *path, if (STRNEQ(newpath, "/")) { char *tmp; - if (!(parentPath = strdup(newpath))) { + if (VIR_STRDUP(parentPath, newpath) < 0) { rc = -ENOMEM; goto cleanup; } @@ -2543,12 +2538,11 @@ static char *virCgroupIdentifyRoot(virCgroupPtr group) } tmp[0] = '\0'; - ret = strdup(group->controllers[i].mountPoint); - tmp[0] = '/'; - if (!ret) { - virReportOOMError(); + if (VIR_STRDUP(ret, group->controllers[i].mountPoint) < 0) { + tmp[0] = '/'; return NULL; } + tmp[0] = '/'; return ret; } diff --git a/src/util/vircommand.c b/src/util/vircommand.c index f6f27d9..eecda58 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -946,9 +946,8 @@ virCommandSetPidFile(virCommandPtr cmd, const char *pidfile) return; VIR_FREE(cmd->pidfile); - if (!(cmd->pidfile = strdup(pidfile))) { + if (VIR_STRDUP(cmd->pidfile, pidfile) < 0) cmd->has_error = ENOMEM; - } } @@ -1049,7 +1048,7 @@ virCommandSetSELinuxLabel(virCommandPtr cmd, #if defined(WITH_SECDRIVER_SELINUX) VIR_FREE(cmd->seLinuxLabel); - if (label && !(cmd->seLinuxLabel = strdup(label))) + if (label && VIR_STRDUP(cmd->seLinuxLabel, label) < 0) cmd->has_error = ENOMEM; #endif return; @@ -1074,7 +1073,7 @@ virCommandSetAppArmorProfile(virCommandPtr cmd, #if defined(WITH_SECDRIVER_APPARMOR) VIR_FREE(cmd->appArmorProfile); - if (profile && !(cmd->appArmorProfile = strdup(profile))) + if (profile && VIR_STRDUP(cmd->appArmorProfile, profile) < 0) cmd->has_error = ENOMEM; #endif return; @@ -1205,7 +1204,7 @@ virCommandAddEnvString(virCommandPtr cmd, const char *str) if (!cmd || cmd->has_error) return; - if (!(env = strdup(str))) { + if (VIR_STRDUP(env, str) < 0) { cmd->has_error = ENOMEM; return; } @@ -1309,7 +1308,7 @@ virCommandAddArg(virCommandPtr cmd, const char *val) if (!cmd || cmd->has_error) return; - if (!(arg = strdup(val))) { + if (VIR_STRDUP(arg, val) < 0) { cmd->has_error = ENOMEM; return; } @@ -1350,11 +1349,11 @@ virCommandAddArgBuffer(virCommandPtr cmd, virBufferPtr buf) } cmd->args[cmd->nargs] = virBufferContentAndReset(buf); - if (!cmd->args[cmd->nargs]) - cmd->args[cmd->nargs] = strdup(""); if (!cmd->args[cmd->nargs]) { - cmd->has_error = ENOMEM; - return; + if (VIR_STRDUP(cmd->args[cmd->nargs], "") < 0) { + cmd->has_error = ENOMEM; + return; + } } cmd->nargs++; } @@ -1440,8 +1439,9 @@ virCommandAddArgSet(virCommandPtr cmd, const char *const*vals) narg = 0; while (vals[narg] != NULL) { - char *arg = strdup(vals[narg++]); - if (!arg) { + char *arg; + + if (VIR_STRDUP(arg, vals[narg++]) < 0) { cmd->has_error = ENOMEM; return; } @@ -1481,8 +1481,7 @@ virCommandAddArgList(virCommandPtr cmd, ...) char *arg = va_arg(list, char *); if (!arg) break; - arg = strdup(arg); - if (!arg) { + if (VIR_STRDUP(arg, arg) < 0) { cmd->has_error = ENOMEM; va_end(list); return; @@ -1511,8 +1510,7 @@ virCommandSetWorkingDirectory(virCommandPtr cmd, const char *pwd) cmd->has_error = -1; VIR_DEBUG("cannot set directory twice"); } else { - cmd->pwd = strdup(pwd); - if (!cmd->pwd) + if (VIR_STRDUP(cmd->pwd, pwd) < 0) cmd->has_error = ENOMEM; } } @@ -1539,8 +1537,7 @@ virCommandSetInputBuffer(virCommandPtr cmd, const char *inbuf) return; } - cmd->inbuf = strdup(inbuf); - if (!cmd->inbuf) + if (VIR_STRDUP(cmd->inbuf, inbuf) < 0) cmd->has_error = ENOMEM; } diff --git a/src/util/virconf.c b/src/util/virconf.c index 16f074a..c578bf4 100644 --- a/src/util/virconf.c +++ b/src/util/virconf.c @@ -23,7 +23,6 @@ #include <config.h> #include <string.h> - #include <stdio.h> #include <unistd.h> #include <sys/types.h> @@ -38,6 +37,7 @@ #include "virlog.h" #include "viralloc.h" #include "virfile.h" +#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_CONF @@ -397,11 +397,8 @@ virConfParseString(virConfParserCtxtPtr ctxt) virConfError(ctxt, VIR_ERR_CONF_SYNTAX, _("unterminated string")); return NULL; } - ret = strndup(base, ctxt->cur - base); - if (ret == NULL) { - virReportOOMError(); + if (VIR_STRNDUP(ret, base, ctxt->cur - base) < 0) return NULL; - } NEXT; } else if ((ctxt->cur + 6 < ctxt->end) && (STRPREFIX(ctxt->cur, "\"\"\""))) { @@ -421,11 +418,8 @@ virConfParseString(virConfParserCtxtPtr ctxt) virConfError(ctxt, VIR_ERR_CONF_SYNTAX, _("unterminated string")); return NULL; } - ret = strndup(base, ctxt->cur - base); - if (ret == NULL) { - virReportOOMError(); + if (VIR_STRNDUP(ret, base, ctxt->cur - base) < 0) return NULL; - } ctxt->cur += 3; } else if (CUR == '"') { NEXT; @@ -436,11 +430,8 @@ virConfParseString(virConfParserCtxtPtr ctxt) virConfError(ctxt, VIR_ERR_CONF_SYNTAX, _("unterminated string")); return NULL; } - ret = strndup(base, ctxt->cur - base); - if (ret == NULL) { - virReportOOMError(); + if (VIR_STRNDUP(ret, base, ctxt->cur - base) < 0) return NULL; - } NEXT; } return ret; @@ -577,11 +568,8 @@ virConfParseName(virConfParserCtxtPtr ctxt) ((ctxt->conf->flags & VIR_CONF_FLAG_VMX_FORMAT) && ((CUR == ':') || (CUR == '.') || (CUR == '-'))))) NEXT; - ret = strndup(base, ctxt->cur - base); - if (ret == NULL) { - virReportOOMError(); + if (VIR_STRNDUP(ret, base, ctxt->cur - base) < 0) return NULL; - } return ret; } @@ -604,11 +592,8 @@ virConfParseComment(virConfParserCtxtPtr ctxt) NEXT; base = ctxt->cur; while ((ctxt->cur < ctxt->end) && (!IS_EOL(CUR))) NEXT; - comm = strndup(base, ctxt->cur - base); - if (comm == NULL) { - virReportOOMError(); + if (VIR_STRNDUP(comm, base, ctxt->cur - base) < 0) return -1; - } virConfAddEntry(ctxt->conf, NULL, NULL, comm); return 0; } @@ -680,9 +665,7 @@ virConfParseStatement(virConfParserCtxtPtr ctxt) NEXT; base = ctxt->cur; while ((ctxt->cur < ctxt->end) && (!IS_EOL(CUR))) NEXT; - comm = strndup(base, ctxt->cur - base); - if (comm == NULL) { - virReportOOMError(); + if (VIR_STRNDUP(comm, base, ctxt->cur - base) < 0) { VIR_FREE(name); virConfFreeValue(value); return -1; @@ -905,8 +888,7 @@ virConfSetValue(virConfPtr conf, return -1; } cur->comment = NULL; - if (!(cur->name = strdup(setting))) { - virReportOOMError(); + if (VIR_STRDUP(cur->name, setting) < 0) { virConfFreeValue(value); VIR_FREE(cur); return -1; diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c index 36f31d2..d37ee3e 100644 --- a/src/util/virdnsmasq.c +++ b/src/util/virdnsmasq.c @@ -118,8 +118,8 @@ addnhostsAdd(dnsmasqAddnHostsfile *addnhostsfile, if (VIR_ALLOC(addnhostsfile->hosts[idx].hostnames) < 0) goto alloc_error; - if (!(addnhostsfile->hosts[idx].ip = strdup(ipstr))) - goto alloc_error; + if (VIR_STRDUP(addnhostsfile->hosts[idx].ip, ipstr) < 0) + goto error; addnhostsfile->hosts[idx].nhostnames = 0; addnhostsfile->nhosts++; @@ -128,9 +128,9 @@ addnhostsAdd(dnsmasqAddnHostsfile *addnhostsfile, if (VIR_REALLOC_N(addnhostsfile->hosts[idx].hostnames, addnhostsfile->hosts[idx].nhostnames + 1) < 0) goto alloc_error; - if (!(addnhostsfile->hosts[idx].hostnames[addnhostsfile->hosts[idx].nhostnames] - = strdup(name))) - goto alloc_error; + if (VIR_STRDUP(addnhostsfile->hosts[idx].hostnames[addnhostsfile->hosts[idx].nhostnames], + name) < 0) + goto error; VIR_FREE(ipstr); @@ -140,6 +140,7 @@ addnhostsAdd(dnsmasqAddnHostsfile *addnhostsfile, alloc_error: virReportOOMError(); + error: VIR_FREE(ipstr); return -1; } @@ -470,10 +471,8 @@ dnsmasqContextNew(const char *network_name, return NULL; } - if (!(ctx->config_dir = strdup(config_dir))) { - virReportOOMError(); + if (VIR_STRDUP(ctx->config_dir, config_dir) < 0) goto error; - } if (!(ctx->hostsfile = hostsfileNew(network_name, config_dir))) goto error; @@ -797,14 +796,15 @@ dnsmasqCapsNewEmpty(const char *binaryPath) return NULL; if (!(caps = virObjectNew(dnsmasqCapsClass))) return NULL; - if (!(caps->flags = virBitmapNew(DNSMASQ_CAPS_LAST))) + if (!(caps->flags = virBitmapNew(DNSMASQ_CAPS_LAST))) { + virReportOOMError(); goto error; - if (!(caps->binaryPath = strdup(binaryPath ? binaryPath : DNSMASQ))) + } + if (VIR_STRDUP(caps->binaryPath, binaryPath ? binaryPath : DNSMASQ) < 0) goto error; return caps; error: - virReportOOMError(); virObjectUnref(caps); return NULL; } diff --git a/src/util/virebtables.c b/src/util/virebtables.c index 6bc6fed..1ac0bd0 100644 --- a/src/util/virebtables.c +++ b/src/util/virebtables.c @@ -51,6 +51,8 @@ #include "virstring.h" #include "virutil.h" +#define VIR_FROM_THIS VIR_FROM_NONE + #if HAVE_FIREWALLD static char *firewall_cmd_path = NULL; @@ -113,7 +115,7 @@ ebtRuleFree(ebtRule *rule) static int ebtRulesAppend(ebtRules *rules, char *rule, - const char **argv, + char **argv, int command_idx) { if (VIR_REALLOC_N(rules->rules, rules->nrules+1) < 0) { @@ -186,10 +188,10 @@ ebtRulesNew(const char *table, if (VIR_ALLOC(rules) < 0) return NULL; - if (!(rules->table = strdup(table))) + if (VIR_STRDUP(rules->table, table) < 0) goto error; - if (!(rules->chain = strdup(chain))) + if (VIR_STRDUP(rules->chain, chain) < 0) goto error; rules->rules = NULL; @@ -207,7 +209,7 @@ ebtablesAddRemoveRule(ebtRules *rules, int action, const char *arg, ...) { va_list args; int retval = ENOMEM; - const char **argv; + char **argv; char *rule = NULL; const char *s; int n, command_idx; @@ -236,36 +238,36 @@ ebtablesAddRemoveRule(ebtRules *rules, int action, const char *arg, ...) #if HAVE_FIREWALLD if (firewall_cmd_path) { - if (!(argv[n++] = strdup(firewall_cmd_path))) + if (VIR_STRDUP(argv[n++], firewall_cmd_path) < 0) goto error; - if (!(argv[n++] = strdup("--direct"))) + if (VIR_STRDUP(argv[n++], "--direct") < 0) goto error; - if (!(argv[n++] = strdup("--passthrough"))) + if (VIR_STRDUP(argv[n++], "--passthrough") < 0) goto error; - if (!(argv[n++] = strdup("eb"))) + if (VIR_STRDUP(argv[n++], "eb") < 0) goto error; } else #endif - if (!(argv[n++] = strdup(EBTABLES_PATH))) + if (VIR_STRDUP(argv[n++], EBTABLES_PATH) < 0) goto error; command_idx = n; if (action == ADD || action == REMOVE) { - if (!(argv[n++] = strdup("--insert"))) + if (VIR_STRDUP(argv[n++], "--insert") < 0) goto error; - if (!(argv[n++] = strdup(rules->chain))) + if (VIR_STRDUP(argv[n++], rules->chain) < 0) goto error; } - if (!(argv[n++] = strdup(arg))) + if (VIR_STRDUP(argv[n++], arg) < 0) goto error; va_start(args, arg); while ((s = va_arg(args, const char *))) { - if (!(argv[n++] = strdup(s))) { + if (VIR_STRDUP(argv[n++], s) < 0) { va_end(args); goto error; } @@ -273,16 +275,16 @@ ebtablesAddRemoveRule(ebtRules *rules, int action, const char *arg, ...) va_end(args); - if (!(rule = virArgvToString(&argv[command_idx]))) + if (!(rule = virArgvToString((const char **) &argv[command_idx]))) goto error; if (action == REMOVE) { VIR_FREE(argv[command_idx]); - if (!(argv[command_idx] = strdup("--delete"))) + if (VIR_STRDUP(argv[command_idx], "--delete") < 0) goto error; } - if (virRun(argv, NULL) < 0) { + if (virRun((const char **)argv, NULL) < 0) { retval = errno; goto error; } diff --git a/src/util/virebtables.h b/src/util/virebtables.h index 671d9dc..3dfe32b 100644 --- a/src/util/virebtables.h +++ b/src/util/virebtables.h @@ -31,7 +31,7 @@ typedef struct { char *rule; - const char **argv; + char **argv; int command_idx; } ebtRule; diff --git a/src/util/virerror.c b/src/util/virerror.c index af4da8c..9b888e5 100644 --- a/src/util/virerror.c +++ b/src/util/virerror.c @@ -164,7 +164,8 @@ virErrorGenericFailure(virErrorPtr err) err->code = VIR_ERR_INTERNAL_ERROR; err->domain = VIR_FROM_NONE; err->level = VIR_ERR_ERROR; - err->message = strdup(_("An error occurred, but the cause is unknown")); + ignore_value(VIR_STRDUP_QUIET(err->message, + _("An error occurred, but the cause is unknown"))); } @@ -184,13 +185,13 @@ virCopyError(virErrorPtr from, to->code = from->code; to->domain = from->domain; to->level = from->level; - if (from->message && !(to->message = strdup(from->message))) + if (from->message && VIR_STRDUP_QUIET(to->message, from->message) < 0) ret = -1; - if (from->str1 && !(to->str1 = strdup(from->str1))) + if (from->str1 && VIR_STRDUP_QUIET(to->str1, from->str1) < 0) ret = -1; - if (from->str2 && !(to->str2 = strdup(from->str2))) + if (from->str2 && VIR_STRDUP_QUIET(to->str2, from->str2) < 0) ret = -1; - if (from->str3 && !(to->str3 = strdup(from->str3))) + if (from->str3 && VIR_STRDUP_QUIET(to->str3, from->str3) < 0) ret = -1; to->int1 = from->int1; to->int2 = from->int2; @@ -646,7 +647,7 @@ virRaiseErrorFull(const char *filename ATTRIBUTE_UNUSED, * formats the message; drop message on OOM situations */ if (fmt == NULL) { - str = strdup(_("No error message provided")); + ignore_value(VIR_STRDUP_QUIET(str, _("No error message provided"))); } else { va_list ap; va_start(ap, fmt); @@ -666,11 +667,11 @@ virRaiseErrorFull(const char *filename ATTRIBUTE_UNUSED, to->message = str; to->level = level; if (str1 != NULL) - to->str1 = strdup(str1); + ignore_value(VIR_STRDUP_QUIET(to->str1, str1)); if (str2 != NULL) - to->str2 = strdup(str2); + ignore_value(VIR_STRDUP_QUIET(to->str2, str2)); if (str3 != NULL) - to->str3 = strdup(str3); + ignore_value(VIR_STRDUP_QUIET(to->str3, str3)); to->int1 = int1; to->int2 = int2; diff --git a/src/util/virhash.c b/src/util/virhash.c index 2fe8751..bb708fc 100644 --- a/src/util/virhash.c +++ b/src/util/virhash.c @@ -30,6 +30,7 @@ #include "virlog.h" #include "virhashcode.h" #include "virrandom.h" +#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_NONE @@ -85,7 +86,9 @@ static bool virHashStrEqual(const void *namea, const void *nameb) static void *virHashStrCopy(const void *name) { - return strdup(name); + char *ret; + ignore_value(VIR_STRDUP(ret, name)); + return ret; } static void virHashStrFree(void *name) diff --git a/src/util/viridentity.c b/src/util/viridentity.c index c9efd3f..e2dc048 100644 --- a/src/util/viridentity.c +++ b/src/util/viridentity.c @@ -34,6 +34,7 @@ #include "virobject.h" #include "virthread.h" #include "virutil.h" +#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_IDENTITY @@ -150,12 +151,11 @@ virIdentityPtr virIdentityGetSystem(void) _("Unable to lookup SELinux process context")); goto cleanup; } - seccontext = strdup(con); - freecon(con); - if (!seccontext) { - virReportOOMError(); + if (VIR_STRDUP(seccontext, con) < 0) { + freecon(con); goto cleanup; } + freecon(con); #endif if (!(ret = virIdentityNew())) @@ -246,12 +246,7 @@ int virIdentitySetAttr(virIdentityPtr ident, goto cleanup; } - if (!(ident->attrs[attr] = strdup(value))) { - virReportOOMError(); - goto cleanup; - } - - ret = 0; + ret = VIR_STRDUP(ident->attrs[attr], value); cleanup: return ret; diff --git a/src/util/virinitctl.c b/src/util/virinitctl.c index 59db057..b980952 100644 --- a/src/util/virinitctl.c +++ b/src/util/virinitctl.c @@ -137,10 +137,8 @@ int virInitctlSetRunLevel(virInitctlRunLevel level, return -1; } } else { - if (!(path = strdup(VIR_INITCTL_FIFO))) { - virReportOOMError(); + if (VIR_STRDUP(path, VIR_INITCTL_FIFO) < 0) return -1; - } } if ((fd = open(path, O_WRONLY|O_NONBLOCK|O_CLOEXEC|O_NOCTTY)) < 0) { diff --git a/src/util/viriptables.c b/src/util/viriptables.c index 06a1356..88c3bcd 100644 --- a/src/util/viriptables.c +++ b/src/util/viriptables.c @@ -118,10 +118,10 @@ iptRulesNew(const char *table, if (VIR_ALLOC(rules) < 0) return NULL; - if (!(rules->table = strdup(table))) + if (VIR_STRDUP(rules->table, table) < 0) goto error; - if (!(rules->chain = strdup(chain))) + if (VIR_STRDUP(rules->chain, chain) < 0) goto error; return rules; diff --git a/src/util/virjson.c b/src/util/virjson.c index 92138d3..66376c1 100644 --- a/src/util/virjson.c +++ b/src/util/virjson.c @@ -107,7 +107,7 @@ virJSONValuePtr virJSONValueNewString(const char *data) return NULL; val->type = VIR_JSON_TYPE_STRING; - if (!(val->data.string = strdup(data))) { + if (VIR_STRDUP(val->data.string, data) < 0) { VIR_FREE(val); return NULL; } @@ -126,7 +126,7 @@ virJSONValuePtr virJSONValueNewStringLen(const char *data, size_t length) return NULL; val->type = VIR_JSON_TYPE_STRING; - if (!(val->data.string = strndup(data, length))) { + if (VIR_STRNDUP(val->data.string, data, length) < 0) { VIR_FREE(val); return NULL; } @@ -142,7 +142,7 @@ static virJSONValuePtr virJSONValueNewNumber(const char *data) return NULL; val->type = VIR_JSON_TYPE_NUMBER; - if (!(val->data.number = strdup(data))) { + if (VIR_STRDUP(val->data.number, data) < 0) { VIR_FREE(val); return NULL; } @@ -269,7 +269,7 @@ int virJSONValueObjectAppend(virJSONValuePtr object, const char *key, virJSONVal if (virJSONValueObjectHasKey(object, key)) return -1; - if (!(newkey = strdup(key))) + if (VIR_STRDUP(newkey, key) < 0) return -1; if (VIR_REALLOC_N(object->data.object.pairs, @@ -751,10 +751,10 @@ static int virJSONParserHandleNumber(void *ctx, yajl_size_t l) { virJSONParserPtr parser = ctx; - char *str = strndup(s, l); + char *str; virJSONValuePtr value; - if (!str) + if (VIR_STRNDUP(str, s, l) < 0) return -1; value = virJSONValueNewNumber(str); VIR_FREE(str); @@ -808,8 +808,7 @@ static int virJSONParserHandleMapKey(void *ctx, state = &parser->state[parser->nstate-1]; if (state->key) return 0; - state->key = strndup((const char *)stringVal, stringLen); - if (!state->key) + if (VIR_STRNDUP(state->key, (const char *)stringVal, stringLen) < 0) return 0; return 1; } @@ -1094,8 +1093,7 @@ char *virJSONValueToString(virJSONValuePtr object, goto cleanup; } - if (!(ret = strdup((const char *)str))) - virReportOOMError(); + ignore_value(VIR_STRDUP(ret, (const char *)str)); cleanup: yajl_gen_free(g); diff --git a/src/util/virkeyfile.c b/src/util/virkeyfile.c index d77e95d..c589ab2 100644 --- a/src/util/virkeyfile.c +++ b/src/util/virkeyfile.c @@ -32,6 +32,7 @@ #include "virhash.h" #include "virkeyfile.h" #include "virerror.h" +#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_CONF @@ -121,10 +122,8 @@ static int virKeyFileParseGroup(virKeyFileParserCtxtPtr ctxt) return -1; } - if (!(ctxt->groupname = strndup(name, ctxt->cur - name))) { - virReportOOMError(); + if (VIR_STRNDUP(ctxt->groupname, name, ctxt->cur - name) < 0) return -1; - } NEXT; @@ -167,10 +166,8 @@ static int virKeyFileParseValue(virKeyFileParserCtxtPtr ctxt) return -1; } - if (!(key = strndup(keystart, ctxt->cur - keystart))) { - virReportOOMError(); + if (VIR_STRNDUP(key, keystart, ctxt->cur - keystart) < 0) return -1; - } NEXT; valuestart = ctxt->cur; @@ -183,10 +180,8 @@ static int virKeyFileParseValue(virKeyFileParserCtxtPtr ctxt) len = ctxt->cur - valuestart; if (IS_EOF && !IS_EOL(CUR)) len++; - if (!(value = strndup(valuestart, len))) { - virReportOOMError(); + if (VIR_STRNDUP(value, valuestart, len) < 0) goto cleanup; - } if (virHashAddEntry(ctxt->group, key, value) < 0) { VIR_FREE(value); diff --git a/src/util/virlockspace.c b/src/util/virlockspace.c index 620a460..060ac2f 100644 --- a/src/util/virlockspace.c +++ b/src/util/virlockspace.c @@ -70,10 +70,8 @@ static char *virLockSpaceGetResourcePath(virLockSpacePtr lockspace, return NULL; } } else { - if (!(ret = strdup(resname))) { - virReportOOMError(); + if (VIR_STRDUP(ret, resname) < 0) return NULL; - } } return ret; @@ -132,8 +130,8 @@ virLockSpaceResourceNew(virLockSpacePtr lockspace, res->fd = -1; res->flags = flags; - if (!(res->name = strdup(resname))) - goto no_memory; + if (VIR_STRDUP(res->name, resname) < 0) + goto error; if (!(res->path = virLockSpaceGetResourcePath(lockspace, resname))) goto no_memory; @@ -262,9 +260,8 @@ virLockSpacePtr virLockSpaceNew(const char *directory) return NULL; } - if (directory && - !(lockspace->dir = strdup(directory))) - goto no_memory; + if (directory && VIR_STRDUP(lockspace->dir, directory) < 0) + goto error; if (!(lockspace->resources = virHashCreate(VIR_LOCKSPACE_TABLE_SIZE, virLockSpaceResourceDataFree))) @@ -290,8 +287,6 @@ virLockSpacePtr virLockSpaceNew(const char *directory) return lockspace; -no_memory: - virReportOOMError(); error: virLockSpaceFree(lockspace); return NULL; @@ -324,10 +319,8 @@ virLockSpacePtr virLockSpaceNewPostExecRestart(virJSONValuePtr object) if (virJSONValueObjectHasKey(object, "directory")) { const char *dir = virJSONValueObjectGetString(object, "directory"); - if (!(lockspace->dir = strdup(dir))) { - virReportOOMError(); + if (VIR_STRDUP(lockspace->dir, dir) < 0) goto error; - } } if (!(resources = virJSONValueObjectGet(object, "resources"))) { @@ -362,8 +355,7 @@ virLockSpacePtr virLockSpaceNewPostExecRestart(virJSONValuePtr object) virLockSpaceResourceFree(res); goto error; } - if (!(res->name = strdup(tmp))) { - virReportOOMError(); + if (VIR_STRDUP(res->name, tmp) < 0) { virLockSpaceResourceFree(res); goto error; } @@ -374,8 +366,7 @@ virLockSpacePtr virLockSpaceNewPostExecRestart(virJSONValuePtr object) virLockSpaceResourceFree(res); goto error; } - if (!(res->path = strdup(tmp))) { - virReportOOMError(); + if (VIR_STRDUP(res->path, tmp) < 0) { virLockSpaceResourceFree(res); goto error; } diff --git a/src/util/virlog.c b/src/util/virlog.c index eee9ddc..2ed0b10 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -557,8 +557,7 @@ virLogDefineFilter(const char *match, } } - mdup = strdup(match); - if (mdup == NULL) { + if (VIR_STRDUP(mdup, match) < 0) { i = -1; goto cleanup; } @@ -664,13 +663,9 @@ virLogDefineOutput(virLogOutputFunc f, if (f == NULL) return -1; - if (dest == VIR_LOG_TO_SYSLOG || dest == VIR_LOG_TO_FILE) { - if (name == NULL) - return -1; - ndup = strdup(name); - if (ndup == NULL) - return -1; - } + if ((dest == VIR_LOG_TO_SYSLOG || dest == VIR_LOG_TO_FILE) && + (!name || VIR_STRDUP(ndup, name) < 0)) + return -1; virLogLock(); if (VIR_REALLOC_N(virLogOutputs, virLogNbOutputs + 1)) { @@ -1047,8 +1042,7 @@ virLogAddOutputToSyslog(virLogPriority priority, * ident needs to be kept around on Solaris */ VIR_FREE(current_ident); - current_ident = strdup(ident); - if (current_ident == NULL) + if (VIR_STRDUP(current_ident, ident) < 0) return -1; openlog(current_ident, 0, 0); @@ -1329,8 +1323,7 @@ virLogParseOutputs(const char *outputs) if (str == cur) goto cleanup; #if HAVE_SYSLOG_H - name = strndup(str, cur - str); - if (name == NULL) + if (VIR_STRNDUP(name, str, cur - str) < 0) goto cleanup; if (virLogAddOutputToSyslog(prio, name) == 0) count++; @@ -1346,8 +1339,7 @@ virLogParseOutputs(const char *outputs) cur++; if (str == cur) goto cleanup; - name = strndup(str, cur - str); - if (name == NULL) + if (VIR_STRNDUP(name, str, cur - str) < 0) goto cleanup; if (virFileAbsPath(name, &abspath) < 0) { VIR_FREE(name); @@ -1424,8 +1416,7 @@ virLogParseFilters(const char *filters) cur++; if (str == cur) goto cleanup; - name = strndup(str, cur - str); - if (name == NULL) + if (VIR_STRNDUP(name, str, cur - str) < 0) goto cleanup; if (virLogDefineFilter(name, prio, flags) >= 0) count++; diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index 0c4fcbd..93bf798 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -31,6 +31,7 @@ #include "virmacaddr.h" #include "virerror.h" #include "virthread.h" +#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_NET @@ -764,14 +765,14 @@ virNetDevMacVLanVPortProfileRegisterCallback(const char *ifname, if (virtPortProfile && virNetlinkEventServiceIsRunning(NETLINK_ROUTE)) { if (VIR_ALLOC(calld) < 0) goto memory_error; - if ((calld->cr_ifname = strdup(ifname)) == NULL) - goto memory_error; + if (VIR_STRDUP(calld->cr_ifname, ifname) < 0) + goto error; if (VIR_ALLOC(calld->virtPortProfile) < 0) goto memory_error; memcpy(calld->virtPortProfile, virtPortProfile, sizeof(*virtPortProfile)); virMacAddrSet(&calld->macaddress, macaddress); - if ((calld->linkdev = strdup(linkdev)) == NULL) - goto memory_error; + if (VIR_STRDUP(calld->linkdev, linkdev) < 0) + goto error; memcpy(calld->vmuuid, vmuuid, sizeof(calld->vmuuid)); calld->vmOp = vmOp; @@ -927,16 +928,13 @@ create_name: VIR_FORCE_CLOSE(rc); /* sets rc to -1 */ goto disassociate_exit; } - if (!(*res_ifname = strdup(cr_ifname))) { + if (VIR_STRDUP(*res_ifname, cr_ifname) < 0) { VIR_FORCE_CLOSE(rc); /* sets rc to -1 */ - virReportOOMError(); goto disassociate_exit; } } else { - if (!(*res_ifname = strdup(cr_ifname))) { - virReportOOMError(); + if (VIR_STRDUP(*res_ifname, cr_ifname) < 0) goto disassociate_exit; - } rc = 0; } diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c index 75599db..08a5599 100644 --- a/src/util/virnetdevtap.c +++ b/src/util/virnetdevtap.c @@ -64,12 +64,7 @@ virNetDevTapGetName(int tapfd ATTRIBUTE_UNUSED, char **ifname ATTRIBUTE_UNUSED) return -1; } - *ifname = strdup(ifr.ifr_name); - if (*ifname == NULL) { - virReportOOMError(); - return -1; - } - return 0; + return VIR_STRDUP(*ifname, ifr.ifr_name); #else return -1; #endif @@ -204,10 +199,8 @@ int virNetDevTapCreate(char **ifname, } VIR_FREE(*ifname); - if (!(*ifname = strdup(ifr.ifr_name))) { - virReportOOMError(); + if (VIR_STRDUP(*ifname, ifr.ifr_name) < 0) goto cleanup; - } if (tapfd) *tapfd = fd; else diff --git a/src/util/virnetdevvportprofile.c b/src/util/virnetdevvportprofile.c index 883aa46..c337fb3 100644 --- a/src/util/virnetdevvportprofile.c +++ b/src/util/virnetdevvportprofile.c @@ -1034,9 +1034,7 @@ virNetDevVPortProfileOp8021Qbh(const char *ifname, goto cleanup; } } else { - physfndev = strdup(ifname); - if (!physfndev) { - virReportOOMError(); + if (VIR_STRDUP(physfndev, ifname) < 0) { rc = -1; goto cleanup; } diff --git a/src/util/virobject.c b/src/util/virobject.c index 93e37e4..72a5248 100644 --- a/src/util/virobject.c +++ b/src/util/virobject.c @@ -28,6 +28,7 @@ #include "viratomic.h" #include "virerror.h" #include "virlog.h" +#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_NONE @@ -37,7 +38,7 @@ struct _virClass { virClassPtr parent; unsigned int magic; - const char *name; + char *name; size_t objectSize; virObjectDisposeCallback dispose; @@ -131,21 +132,22 @@ virClassPtr virClassNew(virClassPtr parent, return NULL; } - if (VIR_ALLOC(klass) < 0) - goto no_memory; + if (VIR_ALLOC(klass) < 0) { + virReportOOMError(); + goto error; + } klass->parent = parent; - if (!(klass->name = strdup(name))) - goto no_memory; + if (VIR_STRDUP(klass->name, name) < 0) + goto error; klass->magic = virAtomicIntInc(&magicCounter); klass->objectSize = objectSize; klass->dispose = dispose; return klass; -no_memory: +error: VIR_FREE(klass); - virReportOOMError(); return NULL; } diff --git a/src/util/virpci.c b/src/util/virpci.c index 5865613..1f19d3f 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -947,10 +947,8 @@ virPCIDeviceUnbindFromStub(virPCIDevicePtr dev) goto cleanup; } /* drvdir = "/sys/bus/pci/drivers/${drivername}" */ - if (!(driver = strdup(last_component(drvdir)))) { - virReportOOMError(); + if (VIR_STRDUP(driver, last_component(drvdir)) < 0) goto cleanup; - } if (!dev->unbind_from_stub) goto remove_slot; @@ -1392,10 +1390,8 @@ virPCIGetAddrString(unsigned int domain, dev = virPCIDeviceNew(domain, bus, slot, function); if (dev != NULL) { - if ((*pciConfigAddr = strdup(dev->name)) == NULL) { - virReportOOMError(); + if (VIR_STRDUP(*pciConfigAddr, dev->name) < 0) goto cleanup; - } ret = 0; } @@ -2268,11 +2264,7 @@ virPCIGetNetName(char *device_link_sysfs_path, char **netname) continue; /* Assume a single directory entry */ - *netname = strdup(entry->d_name); - if (!*netname) - virReportOOMError(); - else - ret = 0; + ret = VIR_STRDUP(*netname, entry->d_name); break; } diff --git a/src/util/virsexpr.c b/src/util/virsexpr.c index 23b6781..b17c0d4 100644 --- a/src/util/virsexpr.c +++ b/src/util/virsexpr.c @@ -119,16 +119,10 @@ sexpr_string(const char *str, ssize_t len) if (ret == NULL) return ret; ret->kind = SEXPR_VALUE; - if (len > 0) { - ret->u.value = strndup(str, len); - } else { - ret->u.value = strdup(str); - } - if (ret->u.value == NULL) { + if ((len > 0 && VIR_STRNDUP(ret->u.value, str, len) < 0) || + (len <= 0 && VIR_STRDUP(ret->u.value, str) < 0)) VIR_FREE(ret); - return NULL; - } return ret; } @@ -325,11 +319,8 @@ _string2sexpr(const char *buffer, size_t * end) ptr++; } - ret->u.value = strndup(start, ptr - start); - if (ret->u.value == NULL) { - virReportOOMError(); + if (VIR_STRNDUP(ret->u.value, start, ptr - start) < 0) goto error; - } if (*ptr == '\'') ptr++; @@ -341,11 +332,8 @@ _string2sexpr(const char *buffer, size_t * end) ptr++; } - ret->u.value = strndup(start, ptr - start); - if (ret->u.value == NULL) { - virReportOOMError(); + if (VIR_STRNDUP(ret->u.value, start, ptr - start) < 0) goto error; - } } ret->kind = SEXPR_VALUE; @@ -403,12 +391,8 @@ sexpr_lookup_key(const struct sexpr *sexpr, const char *node) if ((node == NULL) || (sexpr == NULL)) return NULL; - buffer = strdup(node); - - if (buffer == NULL) { - virReportOOMError(); + if (VIR_STRDUP(buffer, node) < 0) return NULL; - } ptr = buffer; token = strsep(&ptr, "/"); @@ -527,13 +511,10 @@ int sexpr_node_copy(const struct sexpr *sexpr, const char *node, char **dst) { const char *val = sexpr_node(sexpr, node); - if (val && *val) { - *dst = strdup(val); - if (!(*dst)) - return -1; - } else { - *dst = NULL; - } + if (val && *val) + return VIR_STRDUP(*dst, val); + + *dst = NULL; return 0; } diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c index d6a0d93..1a6714e 100644 --- a/src/util/virsocketaddr.c +++ b/src/util/virsocketaddr.c @@ -272,8 +272,8 @@ virSocketAddrFormatFull(virSocketAddrPtr addr, separator ? separator : ":") < 0) goto no_memory; } else { - if (!(addrstr = strdup("127.0.0.1"))) - goto no_memory; + if (VIR_STRDUP(addrstr, "127.0.0.1") < 0) + goto error; } return addrstr; } @@ -293,14 +293,15 @@ virSocketAddrFormatFull(virSocketAddrPtr addr, if (virAsprintf(&addrstr, "%s%s%s", host, separator, port) == -1) goto no_memory; } else { - if (!(addrstr = strdup(host))) - goto no_memory; + if (VIR_STRDUP(addrstr, host) < 0) + goto error; } return addrstr; no_memory: virReportOOMError(); +error: return NULL; } diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index c7bb85a..125f014 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -228,11 +228,8 @@ cowGetBackingStore(char **res, return BACKING_STORE_OK; } - *res = strndup((const char*)buf + 4+4, COW_FILENAME_MAXLEN); - if (*res == NULL) { - virReportOOMError(); + if (VIR_STRNDUP(*res, (const char*)buf + 4+4, COW_FILENAME_MAXLEN) < 0) return BACKING_STORE_ERROR; - } return BACKING_STORE_OK; } @@ -440,11 +437,8 @@ vmdk4GetBackingStore(char **res, goto cleanup; } *end = '\0'; - *res = strdup(start); - if (*res == NULL) { - virReportOOMError(); + if (VIR_STRDUP(*res, start) < 0) goto cleanup; - } ret = BACKING_STORE_OK; @@ -775,9 +769,7 @@ virStorageFileGetMetadataInternal(const char *path, meta->backingStoreIsFile = false; if (backing != NULL) { - meta->backingStore = strdup(backing); - if (meta->backingStore == NULL) { - virReportOOMError(); + if (VIR_STRDUP(meta->backingStore, backing) < 0) { VIR_FREE(backing); goto cleanup; } @@ -1096,10 +1088,8 @@ int virStorageFileIsSharedFSType(const char *path, struct statfs sb; int statfs_ret; - if ((dirpath = strdup(path)) == NULL) { - virReportOOMError(); + if (VIR_STRDUP(dirpath, path) < 0) return -1; - } do { diff --git a/src/util/virstring.c b/src/util/virstring.c index 394a558..13c2420 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -85,8 +85,8 @@ char **virStringSplit(const char *string, if (VIR_RESIZE_N(tokens, maxtokens, ntokens, 1) < 0) goto no_memory; - if (!(tokens[ntokens] = strndup(remainder, len))) - goto no_memory; + if (VIR_STRNDUP(tokens[ntokens], remainder, len) < 0) + goto error; ntokens++; remainder = tmp + delimlen; tmp = strstr(remainder, delim); @@ -96,8 +96,8 @@ char **virStringSplit(const char *string, if (VIR_RESIZE_N(tokens, maxtokens, ntokens, 1) < 0) goto no_memory; - if (!(tokens[ntokens] = strdup(remainder))) - goto no_memory; + if (VIR_STRDUP(tokens[ntokens], remainder) < 0) + goto error; ntokens++; } @@ -109,6 +109,7 @@ char **virStringSplit(const char *string, no_memory: virReportOOMError(); +error: for (i = 0 ; i < ntokens ; i++) VIR_FREE(tokens[i]); VIR_FREE(tokens); @@ -144,12 +145,8 @@ char *virStringJoin(const char **strings, return NULL; } ret = virBufferContentAndReset(&buf); - if (!ret) { - if (!(ret = strdup(""))) { - virReportOOMError(); - return NULL; - } - } + if (!ret) + ignore_value(VIR_STRDUP(ret, "")); return ret; } diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c index 2efe634..7fd2537 100644 --- a/src/util/virsysinfo.c +++ b/src/util/virsysinfo.c @@ -144,32 +144,26 @@ virSysinfoParseSystem(const char *base, virSysinfoDefPtr ret) cur = strchr(cur, ':') + 1; eol = strchr(cur, '\n'); virSkipSpaces(&cur); - if (eol && - ((ret->system_family = strndup(cur, eol - cur)) == NULL)) - goto no_memory; + if (eol && VIR_STRNDUP(ret->system_family, cur, eol - cur) < 0) + return -1; if ((cur = strstr(base, "model")) != NULL) { cur = strchr(cur, ':') + 1; eol = strchr(cur, '\n'); virSkipSpaces(&cur); - if (eol && ((ret->system_serial = strndup(cur, eol - cur)) - == NULL)) - goto no_memory; + if (eol && VIR_STRNDUP(ret->system_serial, cur, eol - cur) < 0) + return -1; } if ((cur = strstr(base, "machine")) != NULL) { cur = strchr(cur, ':') + 1; eol = strchr(cur, '\n'); virSkipSpaces(&cur); - if (eol && ((ret->system_version = strndup(cur, eol - cur)) - == NULL)) - goto no_memory; + if (eol && VIR_STRNDUP(ret->system_version, cur, eol - cur) < 0) + return -1; } return 0; - -no_memory: - return -1; } static int @@ -185,34 +179,31 @@ virSysinfoParseProcessor(const char *base, virSysinfoDefPtr ret) cur = strchr(base, ':') + 1; if (VIR_EXPAND_N(ret->processor, ret->nprocessor, 1) < 0) { - goto no_memory; + return -1; } processor = &ret->processor[ret->nprocessor - 1]; virSkipSpaces(&cur); - if (eol && - ((processor->processor_socket_destination = strndup - (cur, eol - cur)) == NULL)) - goto no_memory; + if (eol && VIR_STRNDUP(processor->processor_socket_destination, + cur, eol - cur) < 0) + return -1; if ((cur = strstr(base, "cpu")) != NULL) { cur = strchr(cur, ':') + 1; eol = strchr(cur, '\n'); virSkipSpaces(&cur); - if (eol && - ((processor->processor_type = strndup(cur, eol - cur)) - == NULL)) - goto no_memory; + if (eol && VIR_STRNDUP(processor->processor_type, + cur, eol - cur) < 0) + return -1; } if ((cur = strstr(base, "revision")) != NULL) { cur = strchr(cur, ':') + 1; eol = strchr(cur, '\n'); virSkipSpaces(&cur); - if (eol && - ((processor->processor_version = strndup(cur, eol - cur)) - == NULL)) - goto no_memory; + if (eol && VIR_STRNUDP(processor->processor_version, + cur, eol - cur) < 0) + return -1; } base = cur; @@ -270,32 +261,26 @@ virSysinfoParseSystem(const char *base, virSysinfoDefPtr ret) cur = strchr(cur, ':') + 1; eol = strchr(cur, '\n'); virSkipSpaces(&cur); - if (eol && - ((ret->system_family = strndup(cur, eol - cur)) == NULL)) - goto no_memory; + if (eol && VIR_STRNDUP(ret->system_family, cur, eol - cur) < 0) + return -1; if ((cur = strstr(base, "model")) != NULL) { cur = strchr(cur, ':') + 1; eol = strchr(cur, '\n'); virSkipSpaces(&cur); - if (eol && ((ret->system_serial = strndup(cur, eol - cur)) - == NULL)) - goto no_memory; + if (eol && VIR_STRNDUP(ret->system_serial, cur, eol - cur) < 0) + return -1; } if ((cur = strstr(base, "machine")) != NULL) { cur = strchr(cur, ':') + 1; eol = strchr(cur, '\n'); virSkipSpaces(&cur); - if (eol && ((ret->system_version = strndup(cur, eol - cur)) - == NULL)) - goto no_memory; + if (eol && VIR_STRNDUP(ret->system_version, cur, eol - cur) < 0) + return -1; } return 0; - -no_memory: - return -1; } static int @@ -313,10 +298,8 @@ virSysinfoParseProcessor(const char *base, virSysinfoDefPtr ret) eol = strchr(base, '\n'); cur = strchr(base, ':') + 1; virSkipSpaces(&cur); - if (eol && - ((processor_type = strndup(cur, eol - cur)) - == NULL)) - goto no_memory; + if (eol && VIR_STRNDUP(processor_type, cur, eol - cur) < 0) + goto error; base = cur; while ((tmp_base = strstr(base, "processor")) != NULL) { @@ -325,19 +308,20 @@ virSysinfoParseProcessor(const char *base, virSysinfoDefPtr ret) cur = strchr(base, ':') + 1; if (VIR_EXPAND_N(ret->processor, ret->nprocessor, 1) < 0) { - goto no_memory; + virReportOOMError(); + goto error; } processor = &ret->processor[ret->nprocessor - 1]; virSkipSpaces(&cur); if (eol && - ((processor->processor_socket_destination = strndup - (cur, eol - cur)) == NULL)) - goto no_memory; + VIR_STRNDUP(processor->processor_socket_destination, + cur, eol - cur) < 0) + goto error; if (processor_type && - !(processor->processor_type = strdup(processor_type))) - goto no_memory; + VIR_STRDUP(processor->processor_type, processor_type) < 0) + goto error; base = cur; } @@ -345,7 +329,7 @@ virSysinfoParseProcessor(const char *base, virSysinfoDefPtr ret) VIR_FREE(processor_type); return 0; -no_memory: +error: VIR_FREE(processor_type); return -1; } @@ -408,15 +392,11 @@ virSysinfoParseDelimited(const char *base, const char *name, char **value, start += 1; end = strchrnul(start, delim2); virSkipSpaces(&start); - if (!((*value) = strndup(start, end - start))) { - virReportOOMError(); - goto error; - } + if (VIR_STRNDUP(*value, start, end - start) < 0) + return NULL; virTrimSpaces(*value, NULL); return end; } - -error: return NULL; } @@ -462,7 +442,8 @@ virSysinfoParseProcessor(const char *base, virSysinfoDefPtr ret) goto cleanup; } processor = &ret->processor[ret->nprocessor - 1]; - processor->processor_manufacturer = strdup(manufacturer); + if (VIR_STRDUP(processor->processor_manufacturer, manufacturer) < 0) + goto cleanup; if (!virSysinfoParseDelimited(procline, "version", &processor->processor_version, '=', ',') || @@ -556,32 +537,29 @@ virSysinfoParseBIOS(const char *base, virSysinfoDefPtr ret) if ((cur = strstr(base, "Vendor: ")) != NULL) { cur += 8; eol = strchr(cur, '\n'); - if ((eol) && ((ret->bios_vendor = strndup(cur, eol - cur)) == NULL)) - goto no_memory; + if (eol && VIR_STRNDUP(ret->bios_vendor, cur, eol - cur) < 0) + return -1; } if ((cur = strstr(base, "Version: ")) != NULL) { cur += 9; eol = strchr(cur, '\n'); - if ((eol) && ((ret->bios_version = strndup(cur, eol - cur)) == NULL)) - goto no_memory; + if (eol && VIR_STRNDUP(ret->bios_version, cur, eol - cur) < 0) + return -1; } if ((cur = strstr(base, "Release Date: ")) != NULL) { cur += 14; eol = strchr(cur, '\n'); - if ((eol) && ((ret->bios_date = strndup(cur, eol - cur)) == NULL)) - goto no_memory; + if (eol && VIR_STRNDUP(ret->bios_date, cur, eol - cur) < 0) + return -1; } if ((cur = strstr(base, "BIOS Revision: ")) != NULL) { cur += 15; eol = strchr(cur, '\n'); - if ((eol) && ((ret->bios_release = strndup(cur, eol - cur)) == NULL)) - goto no_memory; + if (eol && VIR_STRNDUP(ret->bios_release, cur, eol - cur) < 0) + return -1; } return 0; - -no_memory: - return -1; } static int @@ -596,51 +574,47 @@ virSysinfoParseSystem(const char *base, virSysinfoDefPtr ret) if ((cur = strstr(base, "Manufacturer: ")) != NULL) { cur += 14; eol = strchr(cur, '\n'); - if ((eol) && - ((ret->system_manufacturer = strndup(cur, eol - cur)) == NULL)) - goto no_memory; + if (eol && VIR_STRNDUP(ret->system_manufacturer, cur, eol - cur) < 0) + return -1; } if ((cur = strstr(base, "Product Name: ")) != NULL) { cur += 14; eol = strchr(cur, '\n'); - if ((eol) && ((ret->system_product = strndup(cur, eol - cur)) == NULL)) - goto no_memory; + if (eol && VIR_STRNDUP(ret->system_product, cur, eol - cur) < 0) + return -1; } if ((cur = strstr(base, "Version: ")) != NULL) { cur += 9; eol = strchr(cur, '\n'); - if ((eol) && ((ret->system_version = strndup(cur, eol - cur)) == NULL)) - goto no_memory; + if (eol && VIR_STRNDUP(ret->system_version, cur, eol - cur) < 0) + return -1; } if ((cur = strstr(base, "Serial Number: ")) != NULL) { cur += 15; eol = strchr(cur, '\n'); - if ((eol) && ((ret->system_serial = strndup(cur, eol - cur)) == NULL)) - goto no_memory; + if (eol && VIR_STRNDUP(ret->system_serial, cur, eol - cur) < 0) + return -1; } if ((cur = strstr(base, "UUID: ")) != NULL) { cur += 6; eol = strchr(cur, '\n'); - if ((eol) && ((ret->system_uuid = strndup(cur, eol - cur)) == NULL)) - goto no_memory; + if (eol && VIR_STRNDUP(ret->system_uuid, cur, eol - cur) < 0) + return -1; } if ((cur = strstr(base, "SKU Number: ")) != NULL) { cur += 12; eol = strchr(cur, '\n'); - if ((eol) && ((ret->system_sku = strndup(cur, eol - cur)) == NULL)) - goto no_memory; + if (eol && VIR_STRNDUP(ret->system_sku, cur, eol - cur) < 0) + return -1; } if ((cur = strstr(base, "Family: ")) != NULL) { cur += 8; eol = strchr(cur, '\n'); - if ((eol) && ((ret->system_family = strndup(cur, eol - cur)) == NULL)) - goto no_memory; + if (eol && VIR_STRNDUP(ret->system_family, cur, eol - cur) < 0) + return -1; } return 0; - -no_memory: - return -1; } static int @@ -654,117 +628,100 @@ virSysinfoParseProcessor(const char *base, virSysinfoDefPtr ret) base = tmp_base; eol = NULL; - if (VIR_EXPAND_N(ret->processor, ret->nprocessor, 1) < 0) { - goto no_memory; - } + if (VIR_EXPAND_N(ret->processor, ret->nprocessor, 1) < 0) + return -1; processor = &ret->processor[ret->nprocessor - 1]; if ((cur = strstr(base, "Socket Designation: ")) != NULL) { cur += 20; eol = strchr(cur, '\n'); virSkipSpacesBackwards(cur, &eol); - if ((eol) && - ((processor->processor_socket_destination - = strndup(cur, eol - cur)) == NULL)) - goto no_memory; + if (eol && VIR_STRNDUP(processor->processor_socket_destination, + cur, eol - cur) < 0) + return -1; } if ((cur = strstr(base, "Type: ")) != NULL) { cur += 6; eol = strchr(cur, '\n'); virSkipSpacesBackwards(cur, &eol); - if ((eol) && - ((processor->processor_type = strndup(cur, eol - cur)) == NULL)) - goto no_memory; + if (eol && VIR_STRNDUP(processor->processor_type, cur, eol - cur) < 0) + return -1; } if ((cur = strstr(base, "Family: ")) != NULL) { cur += 8; eol = strchr(cur, '\n'); virSkipSpacesBackwards(cur, &eol); - if ((eol) && - ((processor->processor_family = strndup(cur, - eol - cur)) == NULL)) - goto no_memory; + if (eol && VIR_STRNDUP(processor->processor_family, cur, eol - cur) < 0) + return -1; } if ((cur = strstr(base, "Manufacturer: ")) != NULL) { cur += 14; eol = strchr(cur, '\n'); virSkipSpacesBackwards(cur, &eol); - if ((eol) && - ((processor->processor_manufacturer - = strndup(cur, eol - cur)) == NULL)) - goto no_memory; + if (eol && VIR_STRNDUP(processor->processor_manufacturer, + cur, eol - cur) < 0) + return -1; } if ((cur = strstr(base, "Signature: ")) != NULL) { cur += 11; eol = strchr(cur, '\n'); virSkipSpacesBackwards(cur, &eol); - if ((eol) && - ((processor->processor_signature - = strndup(cur, eol - cur)) == NULL)) - goto no_memory; + if (eol && VIR_STRNDUP(processor->processor_signature, + cur, eol - cur) < 0) + return -1; } if ((cur = strstr(base, "Version: ")) != NULL) { cur += 9; eol = strchr(cur, '\n'); virSkipSpacesBackwards(cur, &eol); - if ((eol) && - ((processor->processor_version = strndup(cur, - eol - cur)) == NULL)) - goto no_memory; + if (eol && VIR_STRNDUP(processor->processor_version, + cur, eol - cur) < 0) + return -1; } if ((cur = strstr(base, "External Clock: ")) != NULL) { cur += 16; eol = strchr(cur, '\n'); virSkipSpacesBackwards(cur, &eol); - if ((eol) && - ((processor->processor_external_clock - = strndup(cur, eol - cur)) == NULL)) - goto no_memory; + if (eol && VIR_STRNDUP(processor->processor_external_clock, + cur, eol - cur) < 0) + return -1; } if ((cur = strstr(base, "Max Speed: ")) != NULL) { cur += 11; eol = strchr(cur, '\n'); virSkipSpacesBackwards(cur, &eol); - if ((eol) && - ((processor->processor_max_speed - = strndup(cur, eol - cur)) == NULL)) - goto no_memory; + if (eol && VIR_STRNDUP(processor->processor_max_speed, + cur, eol - cur) < 0) + return -1; } if ((cur = strstr(base, "Status: ")) != NULL) { cur += 8; eol = strchr(cur, '\n'); virSkipSpacesBackwards(cur, &eol); - if ((eol) && - ((processor->processor_status = strndup(cur, - eol - cur)) == NULL)) - goto no_memory; + if (eol && VIR_STRNDUP(processor->processor_status, cur, eol - cur) < 0) + return -1; } if ((cur = strstr(base, "Serial Number: ")) != NULL) { cur += 15; eol = strchr(cur, '\n'); virSkipSpacesBackwards(cur, &eol); - if ((eol) && - ((processor->processor_serial_number - = strndup(cur, eol - cur)) == NULL)) - goto no_memory; + if (eol && VIR_STRNDUP(processor->processor_serial_number, + cur, eol - cur) < 0) + return -1; } if ((cur = strstr(base, "Part Number: ")) != NULL) { cur += 13; eol = strchr(cur, '\n'); virSkipSpacesBackwards(cur, &eol); - if ((eol) && - ((processor->processor_part_number - = strndup(cur, eol - cur)) == NULL)) - goto no_memory; + if (eol && VIR_STRNDUP(processor->processor_part_number, + cur, eol - cur) < 0) + return -1; } base += strlen("Processor Information"); } return 0; - -no_memory: - return -1; } static int @@ -778,9 +735,8 @@ virSysinfoParseMemory(const char *base, virSysinfoDefPtr ret) base = tmp_base; eol = NULL; - if (VIR_EXPAND_N(ret->memory, ret->nmemory, 1) < 0) { - goto no_memory; - } + if (VIR_EXPAND_N(ret->memory, ret->nmemory, 1) < 0) + return -1; memory = &ret->memory[ret->nmemory - 1]; if ((cur = strstr(base, "Size: ")) != NULL) { @@ -790,87 +746,74 @@ virSysinfoParseMemory(const char *base, virSysinfoDefPtr ret) goto next; virSkipSpacesBackwards(cur, &eol); - if ((eol) && - ((memory->memory_size = strndup(cur, eol - cur)) == NULL)) - goto no_memory; + if (eol && VIR_STRNDUP(memory->memory_size, cur, eol - cur) < 0) + return -1; } if ((cur = strstr(base, "Form Factor: ")) != NULL) { cur += 13; eol = strchr(cur, '\n'); virSkipSpacesBackwards(cur, &eol); - if ((eol) && - ((memory->memory_form_factor = strndup(cur, - eol - cur)) == NULL)) - goto no_memory; + if (eol && VIR_STRNDUP(memory->memory_form_factor, + cur, eol - cur) < 0) + return -1; } if ((cur = strstr(base, "Locator: ")) != NULL) { cur += 9; eol = strchr(cur, '\n'); virSkipSpacesBackwards(cur, &eol); - if ((eol) && - ((memory->memory_locator = strndup(cur, eol - cur)) == NULL)) - goto no_memory; + if (eol && VIR_STRNDUP(memory->memory_locator,cur, eol - cur) < 0) + return -1; } if ((cur = strstr(base, "Bank Locator: ")) != NULL) { cur += 14; eol = strchr(cur, '\n'); virSkipSpacesBackwards(cur, &eol); - if ((eol) && - ((memory->memory_bank_locator = strndup(cur, - eol - cur)) == NULL)) - goto no_memory; + if (eol && VIR_STRNDUP(memory->memory_bank_locator, + cur, eol - cur) < 0) + return -1; } if ((cur = strstr(base, "Type: ")) != NULL) { cur += 6; eol = strchr(cur, '\n'); virSkipSpacesBackwards(cur, &eol); - if ((eol) && - ((memory->memory_type = strndup(cur, eol - cur)) == NULL)) - goto no_memory; + if (eol && VIR_STRNDUP(memory->memory_type, cur, eol - cur) < 0) + return -1; } if ((cur = strstr(base, "Type Detail: ")) != NULL) { cur += 13; eol = strchr(cur, '\n'); virSkipSpacesBackwards(cur, &eol); - if ((eol) && - ((memory->memory_type_detail = strndup(cur, - eol - cur)) == NULL)) - goto no_memory; + if (eol && VIR_STRNDUP(memory->memory_type_detail, cur, eol - cur) < 0) + return -1; } if ((cur = strstr(base, "Speed: ")) != NULL) { cur += 7; eol = strchr(cur, '\n'); virSkipSpacesBackwards(cur, &eol); - if ((eol) && - ((memory->memory_speed = strndup(cur, eol - cur)) == NULL)) - goto no_memory; + if (eol && VIR_STRNDUP(memory->memory_speed, cur, eol - cur) < 0) + return -1; } if ((cur = strstr(base, "Manufacturer: ")) != NULL) { cur += 14; eol = strchr(cur, '\n'); virSkipSpacesBackwards(cur, &eol); - if ((eol) && - ((memory->memory_manufacturer = strndup(cur, - eol - cur)) == NULL)) - goto no_memory; + if (eol && VIR_STRNDUP(memory->memory_manufacturer, cur, eol - cur) < 0) + return -1; } if ((cur = strstr(base, "Serial Number: ")) != NULL) { cur += 15; eol = strchr(cur, '\n'); virSkipSpacesBackwards(cur, &eol); - if ((eol) && - ((memory->memory_serial_number = strndup(cur, - eol - cur)) == NULL)) - goto no_memory; + if (eol && VIR_STRNDUP(memory->memory_serial_number, + cur, eol - cur) < 0) + return -1; } if ((cur = strstr(base, "Part Number: ")) != NULL) { cur += 13; eol = strchr(cur, '\n'); virSkipSpacesBackwards(cur, &eol); - if ((eol) && - ((memory->memory_part_number = strndup(cur, - eol - cur)) == NULL)) - goto no_memory; + if (eol && VIR_STRNDUP(memory->memory_part_number, cur, eol - cur) < 0) + return -1; } next: @@ -878,9 +821,6 @@ virSysinfoParseMemory(const char *base, virSysinfoDefPtr ret) } return 0; - -no_memory: - return -1; } virSysinfoDefPtr diff --git a/src/util/virtypedparam.c b/src/util/virtypedparam.c index a9f8a33..4eb5cd6 100644 --- a/src/util/virtypedparam.c +++ b/src/util/virtypedparam.c @@ -150,12 +150,8 @@ virTypedParameterAssign(virTypedParameterPtr param, const char *name, break; case VIR_TYPED_PARAM_STRING: param->value.s = va_arg(ap, char *); - if (!param->value.s) - param->value.s = strdup(""); - if (!param->value.s) { - virReportOOMError(); + if (!param->value.s && VIR_STRDUP(param->value.s, "") < 0) goto cleanup; - } break; default: virReportError(VIR_ERR_INTERNAL_ERROR, @@ -248,10 +244,8 @@ virTypedParameterAssignFromStr(virTypedParameterPtr param, const char *name, } break; case VIR_TYPED_PARAM_STRING: - if (!(param->value.s = strdup(val))) { - virReportOOMError(); + if (VIR_STRDUP(param->value.s, val) < 0) goto cleanup; - } break; default: virReportError(VIR_ERR_INTERNAL_ERROR, @@ -913,10 +907,8 @@ virTypedParamsAddString(virTypedParameterPtr *params, } *maxparams = max; - if (value && !(str = strdup(value))) { - virReportOOMError(); + if (value && VIR_STRDUP(str, value) < 0) goto error; - } if (virTypedParameterAssign(*params + n, name, VIR_TYPED_PARAM_STRING, str) < 0) { diff --git a/src/util/viruri.c b/src/util/viruri.c index 2a75425..745b978 100644 --- a/src/util/viruri.c +++ b/src/util/viruri.c @@ -37,13 +37,13 @@ virURIParamAppend(virURIPtr uri, char *pname = NULL; char *pvalue = NULL; - if (!(pname = strdup(name))) - goto no_memory; - if (!(pvalue = strdup(value))) - goto no_memory; + if (VIR_STRDUP(pname, name) < 0 || VIR_STRDUP(pvalue, value) < 0) + goto error; - if (VIR_RESIZE_N(uri->params, uri->paramsAlloc, uri->paramsCount, 1) < 0) - goto no_memory; + if (VIR_RESIZE_N(uri->params, uri->paramsAlloc, uri->paramsCount, 1) < 0) { + virReportOOMError(); + goto error; + } uri->params[uri->paramsCount].name = pname; uri->params[uri->paramsCount].value = pvalue; @@ -52,10 +52,9 @@ virURIParamAppend(virURIPtr uri, return 0; -no_memory: +error: VIR_FREE(pname); VIR_FREE(pvalue); - virReportOOMError(); return -1; } @@ -167,34 +166,29 @@ virURIParse(const char *uri) return NULL; } - if (VIR_ALLOC(ret) < 0) - goto no_memory; + if (VIR_ALLOC(ret) < 0) { + virReportOOMError(); + goto error; + } - if (xmluri->scheme && - !(ret->scheme = strdup(xmluri->scheme))) - goto no_memory; - if (xmluri->server && - !(ret->server = strdup(xmluri->server))) - goto no_memory; + if (xmluri->scheme && VIR_STRDUP(ret->scheme, xmluri->scheme) < 0) + goto error; + if (xmluri->server && VIR_STRDUP(ret->server, xmluri->server) < 0) + goto error; ret->port = xmluri->port; - if (xmluri->path && - !(ret->path = strdup(xmluri->path))) - goto no_memory; + if (xmluri->path && VIR_STRDUP(ret->path, xmluri->path) < 0) + goto error; #ifdef HAVE_XMLURI_QUERY_RAW - if (xmluri->query_raw && - !(ret->query = strdup(xmluri->query_raw))) - goto no_memory; + if (xmluri->query_raw && VIR_STRDUP(ret->query, xmluri->query_raw) < 0) + goto error; #else - if (xmluri->query && - !(ret->query = strdup(xmluri->query))) - goto no_memory; + if (xmluri->query && VIR_STRDUP(ret->query, xmluri->query) < 0) + goto error; #endif - if (xmluri->fragment && - !(ret->fragment = strdup(xmluri->fragment))) - goto no_memory; - if (xmluri->user && - !(ret->user = strdup(xmluri->user))) - goto no_memory; + if (xmluri->fragment && VIR_STRDUP(ret->fragment, xmluri->fragment) < 0) + goto error; + if (xmluri->user && VIR_STRDUP(ret->user, xmluri->user) < 0) + goto error; /* First check: does it even make sense to jump inside */ if (ret->server != NULL && @@ -220,8 +214,6 @@ virURIParse(const char *uri) return ret; -no_memory: - virReportOOMError(); error: xmlFreeURI(xmluri); virURIFree(ret); diff --git a/src/util/virutil.c b/src/util/virutil.c index 982d4a3..d3d77b2 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -547,11 +547,8 @@ virFileResolveLinkHelper(const char *linkpath, if (lstat(linkpath, &st) < 0) return -1; - if (!S_ISLNK(st.st_mode)) { - if (!(*resultpath = strdup(linkpath))) - return -1; - return 0; - } + if (!S_ISLNK(st.st_mode)) + return VIR_STRDUP(*resultpath, linkpath); } *resultpath = canonicalize_file_name(linkpath); @@ -623,9 +620,11 @@ char *virFindFileInPath(const char *file) * copy of that path, after validating that it is executable */ if (IS_ABSOLUTE_FILE_NAME(file)) { - if (virFileIsExecutable(file)) - return strdup(file); - else + if (virFileIsExecutable(file)) { + char *ret; + ignore_value(VIR_STRDUP(ret, file)); + return ret; + } else return NULL; } @@ -641,7 +640,7 @@ char *virFindFileInPath(const char *file) /* copy PATH env so we can tweak it */ path = getenv("PATH"); - if (path == NULL || (path = strdup(path)) == NULL) + if (!path|| VIR_STRDUP(path, path) < 0) return NULL; /* for each path segment, append the file to search for and test for @@ -1296,7 +1295,7 @@ virFileMakePathWithMode(const char *path, int ret = -1; char *tmp; - if ((tmp = strdup(path)) == NULL) + if (VIR_STRDUP(tmp, path) < 0) goto cleanup; ret = virFileMakePathHelper(tmp, mode); @@ -1503,8 +1502,7 @@ int virFileAbsPath(const char *path, char **abspath) char *buf; if (path[0] == '/') { - if (!(*abspath = strdup(path))) - return -1; + return VIR_STRDUP(*abspath, path); } else { buf = getcwd(NULL, 0); if (buf == NULL) @@ -1528,11 +1526,8 @@ virFileSanitizePath(const char *path) char *cleanpath; int idx = 0; - cleanpath = strdup(path); - if (!cleanpath) { - virReportOOMError(); + if (VIR_STRDUP(cleanpath, path) < 0) return NULL; - } /* Need to sanitize: * // -> // @@ -1963,8 +1958,8 @@ char *virGetHostname(virConnectPtr conn ATTRIBUTE_UNUSED) * string as-is; it's up to callers to check whether "localhost" * is allowed. */ - result = strdup(hostname); - goto check_and_return; + ignore_value(VIR_STRDUP(result, hostname)); + goto cleanup; } /* otherwise, it's a shortened, non-localhost, hostname. Attempt to @@ -1978,8 +1973,8 @@ char *virGetHostname(virConnectPtr conn ATTRIBUTE_UNUSED) if (r != 0) { VIR_WARN("getaddrinfo failed for '%s': %s", hostname, gai_strerror(r)); - result = strdup(hostname); - goto check_and_return; + ignore_value(VIR_STRDUP(result, hostname)); + goto cleanup; } /* Tell static analyzers about getaddrinfo semantics. */ @@ -1991,14 +1986,14 @@ char *virGetHostname(virConnectPtr conn ATTRIBUTE_UNUSED) * localhost. Ignore the canonicalized name and just return the * original hostname */ - result = strdup(hostname); + ignore_value(VIR_STRDUP(result, hostname)); else /* Caller frees this string. */ - result = strdup(info->ai_canonname); + ignore_value(VIR_STRDUP(result, info->ai_canonname)); freeaddrinfo(info); -check_and_return: +cleanup: if (result == NULL) virReportOOMError(); return result; @@ -2052,15 +2047,9 @@ static char *virGetUserEnt(uid_t uid, return NULL; } - if (field == VIR_USER_ENT_DIRECTORY) - ret = strdup(pw->pw_dir); - else - ret = strdup(pw->pw_name); - + ignore_value(VIR_STRDUP(ret, field == VIR_USER_ENT_DIRECTORY ? + pw->pw_dir : pw->pw_name)); VIR_FREE(strbuf); - if (!ret) - virReportOOMError(); - return ret; } @@ -2105,12 +2094,8 @@ static char *virGetGroupEnt(gid_t gid) return NULL; } - ret = strdup(gr->gr_name); - + ignore_value(VIR_STRDUP(ret, gr->gr_name)); VIR_FREE(strbuf); - if (!ret) - virReportOOMError(); - return ret; } @@ -2444,12 +2429,8 @@ virGetWin32SpecialFolder(int csidl, char **path) *path = NULL; if (SHGetSpecialFolderLocation(NULL, csidl, &pidl) == S_OK) { - if (SHGetPathFromIDList(pidl, buf)) { - if (!(*path = strdup(buf))) { - virReportOOMError(); - ret = -1; - } - } + if (SHGetPathFromIDList(pidl, buf) && VIR_STRDUP(*path, buf) < 0) + ret = -1; CoTaskMemFree(pidl); } return ret; @@ -2479,12 +2460,7 @@ virGetWin32DirectoryRoot(char **path) strcpy(windowsdir, "C:\\"); } - if (!(*path = strdup(windowsdir))) { - virReportOOMError(); - ret = -1; - } - - return ret; + return VIR_STRDUP(*path, windowsdir); } @@ -2517,12 +2493,8 @@ virGetUserDirectory(void) /* USERPROFILE is probably the closest equivalent to $HOME? */ dir = getenv("USERPROFILE"); - if (dir) { - if (!(ret = strdup(dir))) { - virReportOOMError(); - return NULL; - } - } + if (dir && VIR_STRDUP(ret, dir) < 0) + return NULL; if (!ret && virGetWin32SpecialFolder(CSIDL_PROFILE, &ret) < 0) @@ -2810,7 +2782,8 @@ char *virFileFindMountPoint(const char *type) while (getmntent_r(f, &mb, mntbuf, sizeof(mntbuf))) { if (STREQ(mb.mnt_type, type)) { - ret = strdup(mb.mnt_dir); + if (VIR_STRDUP(ret, mb.mnt_dir) < 0) + errno = ENOMEM; goto cleanup; } } @@ -3121,10 +3094,8 @@ virReadFCHost(const char *sysfs_prefix, else p = buf; - if (!(*result = strndup(p, sizeof(buf)))) { - virReportOOMError(); + if (VIR_STRNDUP(*result, p, sizeof(buf)) < 0) goto cleanup; - } ret = 0; cleanup: @@ -3348,7 +3319,7 @@ virGetFCHostNameByWWN(const char *sysfs_prefix, continue; } - ret = strdup(entry->d_name); + ignore_value(VIR_STRDUP(ret, entry->d_name)); break; } @@ -3433,7 +3404,7 @@ virFindFCHostCapableVport(const char *sysfs_prefix) if ((strlen(max_vports) >= strlen(vports)) || ((strlen(max_vports) == strlen(vports)) && strcmp(max_vports, vports) > 0)) { - ret = strdup(entry->d_name); + ignore_value(VIR_STRDUP(ret, entry->d_name)); goto cleanup; } diff --git a/src/util/virxml.c b/src/util/virxml.c index 26120b6..f8c595e 100644 --- a/src/util/virxml.c +++ b/src/util/virxml.c @@ -87,11 +87,8 @@ virXPathString(const char *xpath, xmlXPathFreeObject(obj); return NULL; } - ret = strdup((char *) obj->stringval); + ignore_value(VIR_STRDUP(ret, (char *) obj->stringval)); xmlXPathFreeObject(obj); - if (ret == NULL) { - virReportOOMError(); - } return ret; } -- 1.8.1.5

On 05/03/2013 04:53 PM, Michal Privoznik wrote: These functions returned 0 on success before and will need to be adjusted since VIR_STRDUP returns 1 on a successful copy now.

On 05/03/2013 04:53 PM, Michal Privoznik wrote: Bailing out after one unsuccessful strdup? Other parts of this function don't share this defeatist attitude. You have preserved the existing behavior in these three hunks... .. but not in these three. I think you should call ignore_value(VIR_STRDUP()) in all three. Or fix it properly. VIR_STRDUP_QUIET, or remove the virReportOOMError a few lines below. ignore_value(VIR_STRDUP) in both hunks. redundant virReportOOMError() You can delete the else branch with virReportOOMError() The error handling is horrible in a few places, but that's pre-existing. ACK Jan

--- src/vmware/vmware_conf.c | 28 ++++++++++------------------ src/vmware/vmware_driver.c | 11 +++++------ 2 files changed, 15 insertions(+), 24 deletions(-) diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c index 4fb61a8..4b61a9c 100644 --- a/src/vmware/vmware_conf.c +++ b/src/vmware/vmware_conf.c @@ -174,11 +174,8 @@ vmwareLoadDomains(struct vmware_driver *driver) pDomain = vm->privateData; - pDomain->vmxPath = strdup(vmxPath); - if (pDomain->vmxPath == NULL) { - virReportOOMError(); + if (VIR_STRDUP(pDomain->vmxPath, vmxPath) < 0) goto cleanup; - } vmwareDomainConfigDisplay(pDomain, vmdef); @@ -297,22 +294,21 @@ vmwareParsePath(char *path, char **directory, char **filename) return -1; } - if ((*directory = strdup(path)) == NULL) - goto no_memory; - if ((*filename = strdup(separator)) == NULL) { + if (VIR_STRDUP(*directory, path) < 0) + goto error; + if (VIR_STRDUP(*filename, separator) < 0) { VIR_FREE(*directory); - goto no_memory; + goto error; } } else { - if ((*filename = strdup(path)) == NULL) - goto no_memory; + if (VIR_STRDUP(*filename, path) < 0) + goto error; } return 0; -no_memory: - virReportOOMError(); +error: return -1; } @@ -492,12 +488,8 @@ cleanup: char * vmwareCopyVMXFileName(const char *datastorePath, void *opaque ATTRIBUTE_UNUSED) { - char *path = strdup(datastorePath); - - if (path == NULL) { - virReportOOMError(); - return NULL; - } + char *path; + ignore_value(VIR_STRDUP_QUIET(path, datastorePath)); return path; } diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c index 1e2634e..91a271f 100644 --- a/src/vmware/vmware_driver.c +++ b/src/vmware/vmware_driver.c @@ -33,6 +33,7 @@ #include "vmx.h" #include "vmware_conf.h" #include "vmware_driver.h" +#include "virstring.h" static const char *vmw_types[] = { "player", "ws" }; @@ -352,10 +353,8 @@ vmwareDomainDefineXML(virConnectPtr conn, const char *xml) goto cleanup; pDomain = vm->privateData; - if ((pDomain->vmxPath = strdup(vmxPath)) == NULL) { - virReportOOMError(); + if (VIR_STRDUP(pDomain->vmxPath, vmxPath) < 0) goto cleanup; - } vmwareDomainConfigDisplay(pDomain, vmdef); @@ -636,7 +635,8 @@ vmwareDomainCreateXML(virConnectPtr conn, const char *xml, goto cleanup; pDomain = vm->privateData; - pDomain->vmxPath = strdup(vmxPath); + if (VIR_STRDUP(pDomain->vmxPath, vmxPath) < 0) + goto cleanup; vmwareDomainConfigDisplay(pDomain, vmdef); vmdef = NULL; @@ -800,8 +800,7 @@ vmwareDomainGetOSType(virDomainPtr dom) goto cleanup; } - if (!(ret = strdup(vm->def->os.type))) - virReportOOMError(); + ignore_value(VIR_STRDUP(ret, vm->def->os.type)); cleanup: if (vm) -- 1.8.1.5

2013/5/3 Michal Privoznik <mprivozn(a)redhat.com&gt;: Why did you remove the OOM reporting here? -- Matthias Bolte http://photron.blogspot.com

--- src/vmx/vmx.c | 36 ++++++------------------------------ 1 file changed, 6 insertions(+), 30 deletions(-) diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 9ec0269..a75cced 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -682,14 +682,7 @@ virVMXGetConfigString(virConfPtr conf, const char *name, char **string, return -1; } - *string = strdup(value->str); - - if (*string == NULL) { - virReportOOMError(); - return -1; - } - - return 0; + return VIR_STRDUP(*string, value->str); } @@ -1526,12 +1519,8 @@ virVMXParseConfig(virVMXContext *ctx, def->onCrash = VIR_DOMAIN_LIFECYCLE_DESTROY; /* def:os */ - def->os.type = strdup("hvm"); - - if (def->os.type == NULL) { - virReportOOMError(); + if (VIR_STRDUP(def->os.type, "hvm") < 0) goto cleanup; - } /* vmx:guestOS -> def:os.arch */ if (virVMXGetConfigString(conf, "guestOS", &guestOS, true) < 0) { @@ -2579,12 +2568,8 @@ virVMXParseEthernet(virConfPtr conf, int controller, virDomainNetDefPtr *def) if (STRCASEEQ(virtualDev, "vmxnet") && features == 15) { VIR_FREE(virtualDev); - virtualDev = strdup("vmxnet2"); - - if (virtualDev == NULL) { - virReportOOMError(); + if (VIR_STRDUP(virtualDev, "vmxnet2") < 0) goto cleanup; - } } } @@ -2596,13 +2581,8 @@ virVMXParseEthernet(virConfPtr conf, int controller, virDomainNetDefPtr *def) true) < 0) goto cleanup; - if (networkName == NULL) { - networkName = strdup(""); - if (networkName == NULL) { - virReportOOMError(); - goto cleanup; - } - } + if (!networkName && VIR_STRDUP(networkName, "") < 0) + goto cleanup; } /* vmx:vnet -> def:data.ifname */ @@ -2797,12 +2777,8 @@ virVMXParseSerial(virVMXContext *ctx, virConfPtr conf, int port, goto cleanup; } - (*def)->source.data.tcp.host = strdup(parsedUri->server); - - if ((*def)->source.data.tcp.host == NULL) { - virReportOOMError(); + if (VIR_STRDUP((*def)->source.data.tcp.host, parsedUri->server) < 0) goto cleanup; - } if (virAsprintf(&(*def)->source.data.tcp.service, "%d", parsedUri->port) < 0) { -- 1.8.1.5

--- src/xen/block_stats.c | 16 +++++----- src/xen/xen_driver.c | 9 +++--- src/xen/xen_hypervisor.c | 19 ++++-------- src/xen/xen_inotify.c | 15 +++------- src/xen/xend_internal.c | 78 ++++++++++++------------------------------------ src/xen/xm_internal.c | 9 ++---- src/xen/xs_internal.c | 44 ++++++++++----------------- 7 files changed, 59 insertions(+), 131 deletions(-) diff --git a/src/xen/block_stats.c b/src/xen/block_stats.c index ded8d7f..5952971 100644 --- a/src/xen/block_stats.c +++ b/src/xen/block_stats.c @@ -292,14 +292,14 @@ xenLinuxDomainDeviceID(int domid, const char *path) * /sys/devices/xen-backend/(vbd|tap)-{domid}-{devid}/statistics/{...} */ - if (strlen(path) >= 5 && STRPREFIX(path, "/dev/")) - mod_path = strdup(path); - else - ignore_value(virAsprintf(&mod_path, "/dev/%s", path)); - - if (!mod_path) { - virReportOOMError(); - return -1; + if (strlen(path) >= 5 && STRPREFIX(path, "/dev/")) { + if (VIR_STRDUP(mod_path, path) < 0) + return -1; + } else { + if (virAsprintf(&mod_path, "/dev/%s", path) < 0) { + virReportOOMError(); + return -1; + } } retval = -1; diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index 6ad050c..f992ccd 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -443,10 +443,8 @@ xenUnifiedConnectOpen(virConnectPtr conn, virConnectAuthPtr auth, unsigned int f } #endif - if (!(priv->saveDir = strdup(XEN_SAVE_DIR))) { - virReportOOMError(); + if (VIR_STRDUP(priv->saveDir, XEN_SAVE_DIR) < 0) goto fail; - } if (virFileMakePath(priv->saveDir) < 0) { VIR_ERROR(_("Failed to create save dir '%s': %s"), priv->saveDir, @@ -2504,8 +2502,8 @@ xenUnifiedAddDomainInfo(xenUnifiedDomainInfoListPtr list, if (VIR_ALLOC(info) < 0) goto memory_error; - if (!(info->name = strdup(name))) - goto memory_error; + if (VIR_STRDUP(info->name, name) < 0) + goto error; memcpy(info->uuid, uuid, VIR_UUID_BUFLEN); info->id = id; @@ -2521,6 +2519,7 @@ xenUnifiedAddDomainInfo(xenUnifiedDomainInfoListPtr list, return 0; memory_error: virReportOOMError(); +error: if (info) VIR_FREE(info->name); VIR_FREE(info); diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c index e15f7f2..03ebc0e 100644 --- a/src/xen/xen_hypervisor.c +++ b/src/xen/xen_hypervisor.c @@ -1199,16 +1199,12 @@ xenHypervisorGetSchedulerType(virDomainPtr domain, int *nparams) switch (op.u.getschedulerid.sched_id){ case XEN_SCHEDULER_SEDF: - schedulertype = strdup("sedf"); - if (schedulertype == NULL) - virReportOOMError(); + ignore_value(VIR_STRDUP(schedulertype, "sedf")); if (nparams) *nparams = XEN_SCHED_SEDF_NPARAM; break; case XEN_SCHEDULER_CREDIT: - schedulertype = strdup("credit"); - if (schedulertype == NULL) - virReportOOMError(); + ignore_value(VIR_STRDUP(schedulertype, "credit")); if (nparams) *nparams = XEN_SCHED_CRED_NPARAM; break; @@ -2894,14 +2890,9 @@ xenHypervisorDomainGetOSType(virDomainPtr dom) return NULL; } - if (XEN_GETDOMAININFO_FLAGS(dominfo) & DOMFLAGS_HVM) - ostype = strdup("hvm"); - else - ostype = strdup("linux"); - - if (ostype == NULL) - virReportOOMError(); - + ignore_value(VIR_STRDUP(ostype, + XEN_GETDOMAININFO_FLAGS(dominfo) & DOMFLAGS_HVM ? + "hvm" : "linux")); return ostype; } diff --git a/src/xen/xen_inotify.c b/src/xen/xen_inotify.c index d83708c..fe9ce65 100644 --- a/src/xen/xen_inotify.c +++ b/src/xen/xen_inotify.c @@ -39,7 +39,7 @@ #include "virlog.h" #include "viruuid.h" #include "virfile.h" - +#include "virstring.h" #include "xm_internal.h" /* for xenXMDomainConfigParse */ #define VIR_FROM_THIS VIR_FROM_XEN_INOTIFY @@ -62,12 +62,9 @@ xenInotifyXenCacheLookup(virConnectPtr conn, return -1; } - *name = strdup(entry->def->name); memcpy(uuid, entry->def->uuid, VIR_UUID_BUFLEN); - - if (!*name) { + if (VIR_STRDUP(*name, entry->def->name) < 0) { VIR_DEBUG("Error getting dom from def"); - virReportOOMError(); return -1; } return 0; @@ -107,11 +104,8 @@ xenInotifyXendDomainsDirLookup(virConnectPtr conn, list info */ for (i = 0 ; i < priv->configInfoList->count ; i++) { if (!memcmp(rawuuid, priv->configInfoList->doms[i]->uuid, VIR_UUID_BUFLEN)) { - *name = strdup(priv->configInfoList->doms[i]->name); - if (!*name) { - virReportOOMError(); + if (VIR_STRDUP(*name, priv->configInfoList->doms[i]->name) < 0) return -1; - } memcpy(uuid, priv->configInfoList->doms[i]->uuid, VIR_UUID_BUFLEN); VIR_DEBUG("Found dom on list"); return 0; @@ -122,8 +116,7 @@ xenInotifyXendDomainsDirLookup(virConnectPtr conn, return -1; } - if (!(*name = strdup(dom->name))) { - virReportOOMError(); + if (VIR_STRDUP(*name, dom->name) < 0) { virDomainFree(dom); return -1; } diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index 97f44ab..78edba4 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -761,8 +761,7 @@ xenDaemonListDomainsOld(virConnectPtr xend) _for_i = _for_i->u.s.cdr, node = _for_i->u.s.car) { if (node->kind != SEXPR_VALUE) continue; - ret[i] = strdup(node->u.value); - if (!ret[i]) + if (VIR_STRDUP(ret[i], node->u.value) < 0) goto no_memory; i++; } @@ -887,13 +886,8 @@ xenDaemonDomainLookupByID(virConnectPtr xend, "%s", _("domain information incomplete, missing name")); goto error; } - if (domname) { - *domname = strdup(name); - if (*domname == NULL) { - virReportOOMError(); - goto error; - } - } + if (domname && VIR_STRDUP(*domname, name) < 0) + goto error; if (sexpr_uuid(uuid, root, "domain/uuid") < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -1454,14 +1448,8 @@ xenDaemonDomainGetOSType(virDomainPtr domain) if (root == NULL) return NULL; - if (sexpr_lookup(root, "domain/image/hvm")) { - type = strdup("hvm"); - } else { - type = strdup("linux"); - } - - if (type == NULL) - virReportOOMError(); + ignore_value(VIR_STRDUP(type, + sexpr_lookup(root, "domain/image/hvm") ? "hvm" : "linux")); sexpr_free(root); @@ -2363,12 +2351,8 @@ xenDaemonLookupByUUID(virConnectPtr conn, const unsigned char *uuid) else id = -1; - if (domname) { - name = strdup(domname); - - if (name == NULL) - virReportOOMError(); - } + if (domname) + ignore_value(VIR_STRDUP(name, domname)); sexpr_free(root); } @@ -2532,12 +2516,9 @@ xenDaemonAttachDeviceFlags(virDomainPtr domain, priv->xendConfigVersion, 1) < 0) goto cleanup; - if (dev->data.disk->device != VIR_DOMAIN_DISK_DEVICE_CDROM) { - if (!(target = strdup(dev->data.disk->dst))) { - virReportOOMError(); - goto cleanup; - } - } + if (dev->data.disk->device != VIR_DOMAIN_DISK_DEVICE_CDROM && + VIR_STRDUP(target, dev->data.disk->dst) < 0) + goto cleanup; break; case VIR_DOMAIN_DEVICE_NET: @@ -2551,10 +2532,8 @@ xenDaemonAttachDeviceFlags(virDomainPtr domain, char macStr[VIR_MAC_STRING_BUFLEN]; virMacAddrFormat(&dev->data.net->mac, macStr); - if (!(target = strdup(macStr))) { - virReportOOMError(); + if (VIR_STRDUP(target, macStr) < 0) goto cleanup; - } break; case VIR_DOMAIN_DEVICE_HOSTDEV: @@ -2886,12 +2865,9 @@ xenDaemonDomainSetAutostart(virDomainPtr domain, int autostart) /* Change the autostart value in place, then define the new sexpr */ VIR_FREE(autonode->u.s.car->u.value); - autonode->u.s.car->u.value = (autostart ? strdup("start") - : strdup("ignore")); - if (!(autonode->u.s.car->u.value)) { - virReportOOMError(); + if (VIR_STRDUP(autonode->u.s.car->u.value, + autostart ? "start" : "ignore") < 0) goto error; - } if (sexpr2string(root, &buffer) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -3050,9 +3026,7 @@ xenDaemonDomainMigratePerform(virDomainPtr domain, virURIFree(uriptr); return -1; } - hostname = strdup(uriptr->server); - if (!hostname) { - virReportOOMError(); + if (VIR_STRDUP(hostname, uriptr->server) < 0) { virURIFree(uriptr); return -1; } @@ -3072,19 +3046,13 @@ xenDaemonDomainMigratePerform(virDomainPtr domain, /* Get the hostname. */ n = p - uri; /* n = Length of hostname in bytes. */ - hostname = strdup(uri); - if (!hostname) { - virReportOOMError(); + if (VIR_STRDUP(hostname, uri) < 0) return -1; - } hostname[n] = '\0'; } else { /* "hostname" (or IP address) */ - hostname = strdup(uri); - if (!hostname) { - virReportOOMError(); + if (VIR_STRDUP(hostname, uri) < 0) return -1; - } } VIR_DEBUG("hostname = %s, port = %s", hostname, port); @@ -3263,10 +3231,8 @@ xenDaemonListDefinedDomains(virConnectPtr conn, if (node->kind != SEXPR_VALUE) continue; - if ((names[ret++] = strdup(node->u.value)) == NULL) { - virReportOOMError(); + if (VIR_STRDUP(names[ret++], node->u.value) < 0) goto error; - } if (ret >= maxnames) break; @@ -3322,19 +3288,13 @@ xenDaemonGetSchedulerType(virDomainPtr domain, int *nparams) goto error; } if (STREQ(ret, "credit")) { - schedulertype = strdup("credit"); - if (schedulertype == NULL){ - virReportOOMError(); + if (VIR_STRDUP(schedulertype, "credit") < 0) goto error; - } if (nparams) *nparams = XEN_SCHED_CRED_NPARAM; } else if (STREQ(ret, "sedf")) { - schedulertype = strdup("sedf"); - if (schedulertype == NULL){ - virReportOOMError(); + if (VIR_STRDUP(schedulertype, "sedf") < 0) goto error; - } if (nparams) *nparams = XEN_SCHED_SEDF_NPARAM; } else { diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c index 921c66a..b261e34 100644 --- a/src/xen/xm_internal.c +++ b/src/xen/xm_internal.c @@ -260,8 +260,7 @@ xenXMConfigCacheAddFile(virConnectPtr conn, const char *filename) virReportOOMError(); return -1; } - if ((entry->filename = strdup(filename)) == NULL) { - virReportOOMError(); + if (VIR_STRDUP(entry->filename, filename) < 0) { VIR_FREE(entry); return -1; } @@ -1092,10 +1091,8 @@ xenXMDomainDefineXML(virConnectPtr conn, const char *xml) goto error; } - if ((entry->filename = strdup(filename)) == NULL) { - virReportOOMError(); + if (VIR_STRDUP(entry->filename, filename) < 0) goto error; - } entry->def = def; if (virHashAddEntry(priv->configCache, filename, entry) < 0) { @@ -1190,7 +1187,7 @@ xenXMListIterator(void *payload ATTRIBUTE_UNUSED, const void *name, void *data) dom = xenDaemonLookupByName(ctx->conn, name); if (!dom) { - if (!(ctx->names[ctx->count] = strdup(name))) + if (VIR_STRDUP(ctx->names[ctx->count], name) < 0) ctx->oom = 1; else ctx->count++; diff --git a/src/xen/xs_internal.c b/src/xen/xs_internal.c index 5f0df63..776ddc6 100644 --- a/src/xen/xs_internal.c +++ b/src/xen/xs_internal.c @@ -50,6 +50,7 @@ #include "xen_driver.h" #include "xs_internal.h" #include "xen_hypervisor.h" +#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_XEN @@ -851,11 +852,7 @@ xenStoreDomainGetNetworkID(virConnectPtr conn, int id, const char *mac) VIR_FREE(val); if (match) { - ret = strdup(list[i]); - - if (ret == NULL) - virReportOOMError(); - + ignore_value(VIR_STRDUP(ret, list[i])); break; } } @@ -904,10 +901,7 @@ xenStoreDomainGetDiskID(virConnectPtr conn, int id, const char *dev) if ((devlen != len) || memcmp(val, dev, len)) { VIR_FREE(val); } else { - ret = strdup(list[i]); - - if (ret == NULL) - virReportOOMError(); + ignore_value(VIR_STRDUP(ret, list[i])); VIR_FREE(val); VIR_FREE(list); @@ -927,10 +921,7 @@ xenStoreDomainGetDiskID(virConnectPtr conn, int id, const char *dev) if ((devlen != len) || memcmp(val, dev, len)) { VIR_FREE(val); } else { - ret = strdup(list[i]); - - if (ret == NULL) - virReportOOMError(); + ignore_value(VIR_STRDUP(ret, list[i])); VIR_FREE(val); VIR_FREE(list); @@ -982,7 +973,7 @@ xenStoreDomainGetPCIID(virConnectPtr conn, int id, const char *bdf) VIR_FREE(val); if (match) { - ret = strdup(list[i]); + ignore_value(VIR_STRDUP(ret, list[i])); break; } } @@ -1088,22 +1079,22 @@ xenStoreAddWatch(virConnectPtr conn, } } - if (VIR_ALLOC(watch) < 0) - goto no_memory; + if (VIR_ALLOC(watch) < 0) { + virReportOOMError(); + goto error; + } - watch->path = strdup(path); - watch->token = strdup(token); - watch->cb = cb; + watch->cb = cb; watch->opaque = opaque; - - if (watch->path == NULL || watch->token == NULL) { - goto no_memory; - } + if (VIR_STRDUP(watch->path, path) < 0 || + VIR_STRDUP(watch->token, token) < 0) + goto error; /* Make space on list */ n = list->count; if (VIR_REALLOC_N(list->watches, n + 1) < 0) { - goto no_memory; + virReportOOMError(); + goto error; } list->watches[n] = watch; @@ -1111,15 +1102,12 @@ xenStoreAddWatch(virConnectPtr conn, return xs_watch(priv->xshandle, watch->path, watch->token); - no_memory: + error: if (watch) { VIR_FREE(watch->path); VIR_FREE(watch->token); VIR_FREE(watch); } - - virReportOOMError(); - return -1; } -- 1.8.1.5

--- src/xenxs/xen_sxpr.c | 192 +++++++++++++++++++++++---------------------------- src/xenxs/xen_xm.c | 94 +++++++++++-------------- 2 files changed, 125 insertions(+), 161 deletions(-) diff --git a/src/xenxs/xen_sxpr.c b/src/xenxs/xen_sxpr.c index 9a76d04..4b486b2 100644 --- a/src/xenxs/xen_sxpr.c +++ b/src/xenxs/xen_sxpr.c @@ -192,9 +192,8 @@ xenParseSxprChar(const char *value, if (value[0] == '/') { def->source.type = VIR_DOMAIN_CHR_TYPE_DEV; - def->source.data.file.path = strdup(value); - if (!def->source.data.file.path) - goto no_memory; + if (VIR_STRDUP(def->source.data.file.path, value) < 0) + goto error; } else { if ((tmp = strchr(value, ':')) != NULL) { *tmp = '\0'; @@ -215,15 +214,14 @@ xenParseSxprChar(const char *value, switch (def->source.type) { case VIR_DOMAIN_CHR_TYPE_PTY: - if (tty != NULL && - !(def->source.data.file.path = strdup(tty))) - goto no_memory; + if (tty && VIR_STRDUP(def->source.data.file.path, tty) < 0) + goto error; break; case VIR_DOMAIN_CHR_TYPE_FILE: case VIR_DOMAIN_CHR_TYPE_PIPE: - if (!(def->source.data.file.path = strdup(value))) - goto no_memory; + if (VIR_STRDUP(def->source.data.file.path, value) < 0) + goto error; break; case VIR_DOMAIN_CHR_TYPE_TCP: @@ -238,18 +236,14 @@ xenParseSxprChar(const char *value, } if (offset != value && - (def->source.data.tcp.host = strndup(value, - offset - value)) == NULL) - goto no_memory; + VIR_STRNDUP(def->source.data.tcp.host, value, offset - value) < 0) + goto error; offset2 = strchr(offset, ','); - if (offset2 == NULL) - def->source.data.tcp.service = strdup(offset+1); - else - def->source.data.tcp.service = strndup(offset+1, - offset2-(offset+1)); - if (def->source.data.tcp.service == NULL) - goto no_memory; + if ((offset && VIR_STRNDUP(def->source.data.tcp.service, + offset + 1, offset2 - offset - 1) < 0) || + (!offset && VIR_STRDUP(def->source.data.tcp.service, offset + 1) < 0)) + goto error; if (offset2 && strstr(offset2, ",server")) def->source.data.tcp.listen = true; @@ -268,15 +262,14 @@ xenParseSxprChar(const char *value, } if (offset != value && - (def->source.data.udp.connectHost - = strndup(value, offset - value)) == NULL) - goto no_memory; + VIR_STRNDUP(def->source.data.udp.connectHost, value, offset - value) < 0) + goto error; offset2 = strchr(offset, '@'); if (offset2 != NULL) { - if ((def->source.data.udp.connectService - = strndup(offset + 1, offset2-(offset+1))) == NULL) - goto no_memory; + if (VIR_STRNDUP(def->source.data.udp.connectService, + offset + 1, offset2 - offset - 1) < 0) + goto error; offset3 = strchr(offset2, ':'); if (offset3 == NULL) { @@ -286,17 +279,15 @@ xenParseSxprChar(const char *value, } if (offset3 > (offset2 + 1) && - (def->source.data.udp.bindHost - = strndup(offset2 + 1, offset3 - (offset2+1))) == NULL) - goto no_memory; + VIR_STRNDUP(def->source.data.udp.bindHost, + offset2 + 1, offset3 - offset2 - 1) < 0) + goto error; - if ((def->source.data.udp.bindService - = strdup(offset3 + 1)) == NULL) - goto no_memory; + if (VIR_STRDUP(def->source.data.udp.bindService, offset3 + 1) < 0) + goto error; } else { - if ((def->source.data.udp.connectService - = strdup(offset + 1)) == NULL) - goto no_memory; + if (VIR_STRDUP(def->source.data.udp.connectService, offset + 1) < 0) + goto error; } } break; @@ -304,12 +295,9 @@ xenParseSxprChar(const char *value, case VIR_DOMAIN_CHR_TYPE_UNIX: { const char *offset = strchr(value, ','); - if (offset) - def->source.data.nix.path = strndup(value, (offset - value)); - else - def->source.data.nix.path = strdup(value); - if (def->source.data.nix.path == NULL) - goto no_memory; + if ((offset && VIR_STRNDUP(def->source.data.nix.path, value, offset - value) < 0) || + (!offset && VIR_STRDUP(def->source.data.nix.path, value) < 0)) + goto error; if (offset != NULL && strstr(offset, ",server") != NULL) @@ -320,8 +308,6 @@ xenParseSxprChar(const char *value, return def; -no_memory: - virReportOOMError(); error: virDomainChrDefFree(def); return NULL; @@ -411,8 +397,8 @@ xenParseSxprDisks(virDomainDefPtr def, if (sexpr_lookup(node, "device/tap2") && STRPREFIX(src, "tap:")) { - if (!(disk->driverName = strdup("tap2"))) - goto no_memory; + if (VIR_STRDUP(disk->driverName, "tap2") < 0) + goto error; } else { if (VIR_ALLOC_N(disk->driverName, (offset-src)+1) < 0) goto no_memory; @@ -438,8 +424,8 @@ xenParseSxprDisks(virDomainDefPtr def, goto error; } - if (!(driverType = strndup(src, offset - src))) - goto no_memory; + if (VIR_STRNDUP(driverType, src, offset - src) < 0) + goto error; if (STREQ(driverType, "aio")) disk->format = VIR_STORAGE_FILE_RAW; else @@ -490,11 +476,10 @@ xenParseSxprDisks(virDomainDefPtr def, } } - if (!(disk->dst = strdup(dst))) - goto no_memory; - if (src && - !(disk->src = strdup(src))) - goto no_memory; + if (VIR_STRDUP(disk->dst, dst) < 0) + goto error; + if (src && VIR_STRDUP(disk->src, src) < 0) + goto error; if (STRPREFIX(disk->dst, "xvd")) disk->bus = VIR_DOMAIN_DISK_BUS_XEN; @@ -572,26 +557,21 @@ xenParseSxprNets(virDomainDefPtr def, net->type = VIR_DOMAIN_NET_TYPE_BRIDGE; /* XXX virtual network reverse resolve */ - if (tmp && - !(net->data.bridge.brname = strdup(tmp))) - goto no_memory; - if (tmp2 && - net->type == VIR_DOMAIN_NET_TYPE_BRIDGE && - !(net->script = strdup(tmp2))) - goto no_memory; + if (tmp && VIR_STRDUP(net->data.bridge.brname, tmp) < 0) + goto cleanup; + if (tmp2 && net->type == VIR_DOMAIN_NET_TYPE_BRIDGE && + VIR_STRDUP(net->script, tmp2) < 0) + goto cleanup; tmp = sexpr_node(node, "device/vif/ip"); - if (tmp && - !(net->data.bridge.ipaddr = strdup(tmp))) - goto no_memory; + if (tmp && VIR_STRDUP(net->data.bridge.ipaddr, tmp) < 0) + goto cleanup; } else { net->type = VIR_DOMAIN_NET_TYPE_ETHERNET; - if (tmp2 && - !(net->script = strdup(tmp2))) - goto no_memory; + if (tmp2 && VIR_STRDUP(net->script, tmp2) < 0) + goto cleanup; tmp = sexpr_node(node, "device/vif/ip"); - if (tmp && - !(net->data.ethernet.ipaddr = strdup(tmp))) - goto no_memory; + if (tmp && VIR_STRDUP(net->data.ethernet.ipaddr, tmp) < 0) + goto cleanup; } tmp = sexpr_node(node, "device/vif/vifname"); @@ -599,8 +579,8 @@ xenParseSxprNets(virDomainDefPtr def, * definition regardless of domain state. If vifname is not * specified, only generate one if domain is active (id != -1). */ if (tmp) { - if (!(net->ifname = strdup(tmp))) - goto no_memory; + if (VIR_STRDUP(net->ifname, tmp) < 0) + goto cleanup; } else if (def->id != -1) { if (virAsprintf(&net->ifname, "vif%d.%d", def->id, vif_index) < 0) goto no_memory; @@ -615,14 +595,12 @@ xenParseSxprNets(virDomainDefPtr def, } } - if (model && - !(net->model = strdup(model))) - goto no_memory; + if (model && VIR_STRDUP(net->model, model) < 0) + goto cleanup; - if (!model && type && - STREQ(type, "netfront") && - !(net->model = strdup("netfront"))) - goto no_memory; + if (!model && type && STREQ(type, "netfront") && + VIR_STRDUP(net->model, "netfront") < 0) + goto cleanup; if (VIR_REALLOC_N(def->nets, def->nnets + 1) < 0) goto no_memory; @@ -834,12 +812,12 @@ xenParseSxprGraphicsOld(virDomainDefPtr def, goto error; if (vncPasswd && - !(graphics->data.vnc.auth.passwd = strdup(vncPasswd))) - goto no_memory; + VIR_STRDUP(graphics->data.vnc.auth.passwd, vncPasswd) < 0) + goto error; if (keymap && - !(graphics->data.vnc.keymap = strdup(keymap))) - goto no_memory; + VIR_STRDUP(graphics->data.vnc.keymap, keymap) < 0) + goto error; if (VIR_ALLOC_N(def->graphics, 1) < 0) goto no_memory; @@ -857,11 +835,11 @@ xenParseSxprGraphicsOld(virDomainDefPtr def, graphics->type = VIR_DOMAIN_GRAPHICS_TYPE_SDL; if (display && - !(graphics->data.sdl.display = strdup(display))) - goto no_memory; + VIR_STRDUP(graphics->data.sdl.display, display) < 0) + goto error; if (xauth && - !(graphics->data.sdl.xauth = strdup(xauth))) - goto no_memory; + VIR_STRDUP(graphics->data.sdl.xauth, xauth) < 0) + goto error; if (VIR_ALLOC_N(def->graphics, 1) < 0) goto no_memory; @@ -927,11 +905,11 @@ xenParseSxprGraphicsNew(virDomainDefPtr def, const char *display = sexpr_node(node, "device/vfb/display"); const char *xauth = sexpr_node(node, "device/vfb/xauthority"); if (display && - !(graphics->data.sdl.display = strdup(display))) - goto no_memory; + VIR_STRDUP(graphics->data.sdl.display, display) < 0) + goto error; if (xauth && - !(graphics->data.sdl.xauth = strdup(xauth))) - goto no_memory; + VIR_STRDUP(graphics->data.sdl.xauth, xauth) < 0) + goto error; } else { int port; const char *listenAddr = sexpr_node(node, "device/vfb/vnclisten"); @@ -961,12 +939,12 @@ xenParseSxprGraphicsNew(virDomainDefPtr def, goto error; if (vncPasswd && - !(graphics->data.vnc.auth.passwd = strdup(vncPasswd))) - goto no_memory; + VIR_STRDUP(graphics->data.vnc.auth.passwd, vncPasswd) < 0) + goto error; if (keymap && - !(graphics->data.vnc.keymap = strdup(keymap))) - goto no_memory; + VIR_STRDUP(graphics->data.vnc.keymap, keymap) < 0) + goto error; } if (VIR_ALLOC_N(def->graphics, 1) < 0) @@ -1180,8 +1158,8 @@ xenParseSxpr(const struct sexpr *root, if (!def->os.bootloader && sexpr_has(root, "domain/bootloader") && - (def->os.bootloader = strdup("")) == NULL) - goto no_memory; + VIR_STRDUP(def->os.bootloader, "") < 0) + goto error; if (def->os.bootloader && sexpr_node_copy(root, "domain/bootloader_args", @@ -1189,8 +1167,8 @@ xenParseSxpr(const struct sexpr *root, goto no_memory; } - if (!(def->os.type = strdup(hvm ? "hvm" : "linux"))) - goto no_memory; + if (VIR_STRDUP(def->os.type, hvm ? "hvm" : "linux") < 0) + goto error; if (def->id != 0) { if (sexpr_lookup(root, "domain/image")) { @@ -1357,19 +1335,19 @@ xenParseSxpr(const struct sexpr *root, virDomainDiskDefPtr disk; if (VIR_ALLOC(disk) < 0) goto no_memory; - if (!(disk->src = strdup(tmp))) { + if (VIR_STRDUP(disk->src, tmp) < 0) { virDomainDiskDefFree(disk); - goto no_memory; + goto error; } disk->type = VIR_DOMAIN_DISK_TYPE_FILE; disk->device = VIR_DOMAIN_DISK_DEVICE_CDROM; - if (!(disk->dst = strdup("hdc"))) { + if (VIR_STRDUP(disk->dst, "hdc") < 0) { virDomainDiskDefFree(disk); - goto no_memory; + goto error; } - if (!(disk->driverName = strdup("file"))) { + if (VIR_STRDUP(disk->driverName, "file") < 0) { virDomainDiskDefFree(disk); - goto no_memory; + goto error; } disk->bus = VIR_DOMAIN_DISK_BUS_IDE; disk->readonly = true; @@ -1393,19 +1371,19 @@ xenParseSxpr(const struct sexpr *root, virDomainDiskDefPtr disk; if (VIR_ALLOC(disk) < 0) goto no_memory; - if (!(disk->src = strdup(tmp))) { + if (VIR_STRDUP(disk->src, tmp) < 0) { VIR_FREE(disk); - goto no_memory; + goto error; } disk->type = VIR_DOMAIN_DISK_TYPE_FILE; disk->device = VIR_DOMAIN_DISK_DEVICE_FLOPPY; - if (!(disk->dst = strdup(fds[i]))) { + if (VIR_STRDUP(disk->dst, fds[i]) < 0) { virDomainDiskDefFree(disk); - goto no_memory; + goto error; } - if (!(disk->driverName = strdup("file"))) { + if (VIR_STRDUP(disk->driverName, "file") < 0) { virDomainDiskDefFree(disk); - goto no_memory; + goto error; } disk->bus = VIR_DOMAIN_DISK_BUS_FDC; diff --git a/src/xenxs/xen_xm.c b/src/xenxs/xen_xm.c index 57ce2e7..d3c44c8 100644 --- a/src/xenxs/xen_xm.c +++ b/src/xenxs/xen_xm.c @@ -183,12 +183,7 @@ static int xenXMConfigCopyStringInternal(virConfPtr conf, return -1; } - if (!(*value = strdup(val->str))) { - virReportOOMError(); - return -1; - } - - return 0; + return VIR_STRDUP(*value, val->str); } @@ -288,8 +283,8 @@ xenParseXM(virConfPtr conf, int xendConfigVersion, STREQ(str, "hvm")) hvm = 1; - if (!(def->os.type = strdup(hvm ? "hvm" : "xen"))) - goto no_memory; + if (VIR_STRDUP(def->os.type, hvm ? "hvm" : "xen") < 0) + goto cleanup; def->os.arch = virCapabilitiesDefaultGuestArch(caps, @@ -307,8 +302,8 @@ xenParseXM(virConfPtr conf, int xendConfigVersion, def->os.arch, virDomainVirtTypeToString(def->virtType)); if (defaultMachine != NULL) { - if (!(def->os.machine = strdup(defaultMachine))) - goto no_memory; + if (VIR_STRDUP(def->os.machine, defaultMachine) < 0) + goto cleanup; } if (hvm) { @@ -562,8 +557,8 @@ xenParseXM(virConfPtr conf, int xendConfigVersion, if (!(tmp = strchr(disk->src, ':'))) goto skipdisk; - if (!(driverType = strndup(disk->src, tmp - disk->src))) - goto no_memory; + if (VIR_STRNDUP(driverType, disk->src, tmp - disk->src) < 0) + goto cleanup; if (STREQ(driverType, "aio")) disk->format = VIR_STORAGE_FILE_RAW; else @@ -585,8 +580,8 @@ xenParseXM(virConfPtr conf, int xendConfigVersion, /* No source, or driver name, so fix to phy: */ if (!disk->driverName && - !(disk->driverName = strdup("phy"))) - goto no_memory; + VIR_STRDUP(disk->driverName, "phy") < 0) + goto cleanup; /* phy: type indicates a block device */ @@ -637,12 +632,12 @@ xenParseXM(virConfPtr conf, int xendConfigVersion, disk->type = VIR_DOMAIN_DISK_TYPE_FILE; disk->device = VIR_DOMAIN_DISK_DEVICE_CDROM; - if (!(disk->driverName = strdup("file"))) - goto no_memory; - if (!(disk->src = strdup(str))) - goto no_memory; - if (!(disk->dst = strdup("hdc"))) - goto no_memory; + if (VIR_STRDUP(disk->driverName, "file") < 0) + goto cleanup; + if (VIR_STRDUP(disk->src, str) < 0) + goto cleanup; + if (VIR_STRDUP(disk->dst, "hdc") < 0) + goto cleanup; disk->bus = VIR_DOMAIN_DISK_BUS_IDE; disk->readonly = true; @@ -703,9 +698,8 @@ xenParseXM(virConfPtr conf, int xendConfigVersion, } else if (STRPREFIX(key, "script=")) { int len = nextkey ? (nextkey - data) : strlen(data); VIR_FREE(script); - if (!(script = strndup(data, len))) { - goto no_memory; - } + if (VIR_STRNDUP(script, data, len) < 0) + goto cleanup; } else if (STRPREFIX(key, "model=")) { int len = nextkey ? (nextkey - data) : sizeof(model) - 1; if (virStrncpy(model, data, len, sizeof(model)) == NULL) { @@ -763,34 +757,27 @@ xenParseXM(virConfPtr conf, int xendConfigVersion, } if (net->type == VIR_DOMAIN_NET_TYPE_BRIDGE) { - if (bridge[0] && - !(net->data.bridge.brname = strdup(bridge))) - goto no_memory; - if (ip[0] && - !(net->data.bridge.ipaddr = strdup(ip))) - goto no_memory; + if (bridge[0] && VIR_STRDUP(net->data.bridge.brname, bridge) < 0) + goto cleanup; + if (ip[0] && VIR_STRDUP(net->data.bridge.ipaddr, ip) < 0) + goto cleanup; } else { - if (ip[0] && - !(net->data.ethernet.ipaddr = strdup(ip))) - goto no_memory; + if (ip[0] && VIR_STRDUP(net->data.ethernet.ipaddr, ip) < 0) + goto cleanup; } - if (script && script[0] && - !(net->script = strdup(script))) - goto no_memory; + if (script && script[0] && VIR_STRDUP(net->script, script) < 0) + goto cleanup; - if (model[0] && - !(net->model = strdup(model))) + if (model[0] && VIR_STRDUP(net->model, model) < 0) goto no_memory; - if (!model[0] && type[0] && - STREQ(type, "netfront") && - !(net->model = strdup("netfront"))) - goto no_memory; + if (!model[0] && type[0] && STREQ(type, "netfront") && + VIR_STRDUP(net->model, "netfront") < 0) + goto cleanup; - if (vifname[0] && - !(net->ifname = strdup(vifname))) - goto no_memory; + if (vifname[0] && VIR_STRDUP(net->ifname, vifname) < 0) + goto cleanup; if (VIR_REALLOC_N(def->nets, def->nnets+1) < 0) goto no_memory; @@ -1019,21 +1006,21 @@ xenParseXM(virConfPtr conf, int xendConfigVersion, -1, true) < 0) goto cleanup; } else if (STRPREFIX(key, "vncpasswd=")) { - if (!(graphics->data.vnc.auth.passwd = strdup(key + 10))) - goto no_memory; + if (VIR_STRDUP(graphics->data.vnc.auth.passwd, key + 10) < 0) + goto cleanup; } else if (STRPREFIX(key, "keymap=")) { - if (!(graphics->data.vnc.keymap = strdup(key + 7))) - goto no_memory; + if (VIR_STRDUP(graphics->data.vnc.keymap, key + 7) < 0) + goto cleanup; } else if (STRPREFIX(key, "vncdisplay=")) { graphics->data.vnc.port = strtol(key+11, NULL, 10) + 5900; } } else { if (STRPREFIX(key, "display=")) { - if (!(graphics->data.sdl.display = strdup(key + 8))) - goto no_memory; + if (VIR_STRDUP(graphics->data.sdl.display, key + 8) < 0) + goto cleanup; } else if (STRPREFIX(key, "xauthority=")) { - if (!(graphics->data.sdl.xauth = strdup(key + 11))) - goto no_memory; + if (VIR_STRDUP(graphics->data.sdl.xauth, key + 11) < 0) + goto cleanup; } } @@ -1193,9 +1180,8 @@ int xenXMConfigSetString(virConfPtr conf, const char *setting, const char *str) value->type = VIR_CONF_STRING; value->next = NULL; - if (!(value->str = strdup(str))) { + if (VIR_STRDUP(value->str, str) < 0) { VIR_FREE(value); - virReportOOMError(); return -1; } -- 1.8.1.5

On 05/03/2013 04:53 PM, Michal Privoznik wrote: This is used as a comparison function for qsort, returning -1 doesn't mean an error. I'd suggest ignore_value(VIR_STRNDUP_QUIET()) instead, and dropping the #define. VIR_STRDUP_QUIET ACK Jan

On 05/03/2013 04:53 PM, Michal Privoznik wrote: Duplicate virReportOOMError in these two hunks. VIR_STRDUP accepts NULL now, you should check if pool is non-null as well. This function doesn't report any errors. But it's an improvement to report an extra message than crash on OOM. ACK Jan

--- cfg.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/cfg.mk b/cfg.mk index 1d63bbd..4ed2c3a 100644 --- a/cfg.mk +++ b/cfg.mk @@ -387,6 +387,11 @@ sc_prohibit_asprintf: halt='use strdup instead of virAsprintf with "%s"' \ $(_sc_search_regexp) +sc_prohibit_strdup: + @prohibit='\<strn?dup\> *\(' \ + halt='use VIR_STRUP, not strdup' \ + $(_sc_search_regexp) + # Prefer virSetUIDGID. sc_prohibit_setuid: @prohibit='\<set(re)?[ug]id\> *\(' \ @@ -864,6 +869,9 @@ exclude_file_name_regexp--sc_prohibit_always_true_header_tests = \ exclude_file_name_regexp--sc_prohibit_asprintf = \ ^(bootstrap.conf$$|src/util/virstring\.c$$|examples/domain-events/events-c/event-test\.c$$|tests/vircgroupmock\.c$$) +exclude_file_name_regexp--sc_prohibit_strdup = \ + ^(docs/|examples/|python/|src/util/virstring\.c$$|tools/virsh\.c$$) + exclude_file_name_regexp--sc_prohibit_close = \ (\.p[yl]$$|^docs/|^(src/util/virfile\.c|src/libvirt\.c|tests/vircgroupmock\.c)$$) -- 1.8.1.5

On 07.05.2013 05:54, Eric Blake wrote: Do you mean we should s/strdup/VIR_STRDUP/ within vshStrdup? And I'll fix python surely. Michal