[ovs-dev] [PATCH] lib Windows: Use xmalloc instead of malloc
Alin Serdean
aserdean at cloudbasesolutions.com
Fri May 19 21:51:27 UTC 2017
Thanks for the patch!
Xmalloc also check if the allocation was successful.
Mind also removing the checks for null afterwards?
Thanks,
Alin.
> -----Original Message-----
> From: ovs-dev-bounces at openvswitch.org [mailto:ovs-dev-
> bounces at openvswitch.org] On Behalf Of Shashank Ram
> Sent: Saturday, May 20, 2017 12:39 AM
> To: dev at openvswitch.org
> Subject: [ovs-dev] [PATCH] lib Windows: Use xmalloc instead of malloc
>
> xmalloc checks if the size is valid before allocating memory.
>
> Signed-off-by: Shashank Ram <rams at vmware.com>
> ---
> lib/netdev-windows.c | 4 ++--
> lib/wmi.c | 4 ++--
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/lib/netdev-windows.c b/lib/netdev-windows.c index
> 375cb32..b4b39e9 100644
> --- a/lib/netdev-windows.c
> +++ b/lib/netdev-windows.c
> @@ -394,7 +394,7 @@ netdev_windows_arp_lookup(const struct netdev
> *netdev,
> return ENXIO;
> }
>
> - arp_table = (MIB_IPNETTABLE *) malloc(buffer_length);
> + arp_table = (MIB_IPNETTABLE *) xmalloc(buffer_length);
>
> if (arp_table == NULL) {
> VLOG_ERR("Could not allocate memory for all the interfaces"); @@ -
> 443,7 +443,7 @@ netdev_windows_get_next_hop(const struct in_addr
> *host,
> return ENXIO;
> }
[Alin Serdean] remove if
>
> - all_addr = (IP_ADAPTER_ADDRESSES *) malloc(buffer_length);
> + all_addr = (IP_ADAPTER_ADDRESSES *) xmalloc(buffer_length);
>
> if (all_addr == NULL) {
> VLOG_ERR("Could not allocate memory for all the interfaces");
[Alin Serdean] remove if
diff --git
> a/lib/wmi.c b/lib/wmi.c index dba8022..b560a7e 100644
> --- a/lib/wmi.c
> +++ b/lib/wmi.c
> @@ -406,7 +406,7 @@ delete_wmi_port(char *name)
> wchar_t internal_port_query[WMI_QUERY_COUNT] = L"SELECT * from "
> L"Msvm_EthernetPortAllocationSettingData WHERE ElementName = \""
> ;
>
> - wide_name = malloc((strlen(name) + 1) * sizeof(wchar_t));
> + wide_name = xmalloc((strlen(name) + 1) * sizeof(wchar_t));
> if (wide_name == NULL) {
> VLOG_WARN("Could not allocate memory for wide string");
> retval = false;
[Alin Serdean] remove if
> @@ -693,7 +693,7 @@ create_wmi_port(char *name) {
> wchar_t internal_port_query[WMI_QUERY_COUNT] = L"SELECT * FROM "
> L"Msvm_InternalEthernetPort WHERE ElementName = \"";
>
> - wide_name = malloc((strlen(name) + 1) * sizeof(wchar_t));
> + wide_name = xmalloc((strlen(name) + 1) * sizeof(wchar_t));
> if (wide_name == NULL) {
> VLOG_WARN("Could not allocate memory for wide string");
> retval = false;
[Alin Serdean] remove if
> --
> 2.9.3.windows.2
>
> _______________________________________________
> dev mailing list
> dev at openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
More information about the dev
mailing list