diff options
author | Sairam Venugopal <vsairam@vmware.com> | 2016-07-01 13:49:31 -0700 |
---|---|---|
committer | Gurucharan Shetty <guru@ovn.org> | 2016-07-01 20:52:34 -0700 |
commit | 8bed11fd283edabe942434451c3b431a61bfba89 (patch) | |
tree | 6a780b9177539988724add9c3ee2200b895e3c2c /datapath-windows/ovsext/Conntrack-other.c | |
parent | b50d56a76732d833d7c4ce3cc12b7a200a61bd4b (diff) | |
download | openvswitch-8bed11fd283edabe942434451c3b431a61bfba89.tar.gz |
datapath-windows: Conntrack - Handle memory allocation failure
Return null if Windows fails to allocate memory for the conntrack entry.
Signed-off-by: Sairam Venugopal <vsairam@vmware.com>
Acked-by: Paul-Daniel Boca <pboca@cloudbasesolutions.com>
Acked-by: Nithin Raju <nithin@vmware.com>
Signed-off-by: Gurucharan Shetty <guru@ovn.org>
Diffstat (limited to 'datapath-windows/ovsext/Conntrack-other.c')
-rw-r--r-- | datapath-windows/ovsext/Conntrack-other.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/datapath-windows/ovsext/Conntrack-other.c b/datapath-windows/ovsext/Conntrack-other.c index 5d393892f..b85302038 100644 --- a/datapath-windows/ovsext/Conntrack-other.c +++ b/datapath-windows/ovsext/Conntrack-other.c @@ -73,8 +73,9 @@ OvsConntrackCreateOtherEntry(UINT64 now) struct conn_other *conn; conn = OvsAllocateMemoryWithTag(sizeof(struct conn_other), OVS_CT_POOL_TAG); - /* XXX Handle memory allocation error (by returning a status) */ - ASSERT(conn); + if (!conn) { + return NULL; + } conn->up = (OVS_CT_ENTRY) {0}; conn->state = OTHERS_FIRST; OvsConntrackUpdateExpiration(conn, now); |