diff options
| author | qctecmdr Service <qctecmdr@qualcomm.com> | 2018-03-06 21:47:19 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-03-06 21:47:18 -0800 |
| commit | d0cf1ce925b776688d8da36af99cb1ff33bc2000 (patch) | |
| tree | ac2fbfffdab8ef962ca6d71f0bdec8c77b33f220 /ipacm/src/IPACM_Conntrack_NATApp.cpp | |
| parent | c4a4e3385d82da37738b14e8c582a2d9685fc35e (diff) | |
| parent | 2e0b44cc7059f9a90e131ef26b6b3c52fc6f686f (diff) | |
| download | ipacfg-mgr-d0cf1ce925b776688d8da36af99cb1ff33bc2000.tar.gz | |
Merge "ipacm: Fix KW issue"
Diffstat (limited to 'ipacm/src/IPACM_Conntrack_NATApp.cpp')
| -rw-r--r-- | ipacm/src/IPACM_Conntrack_NATApp.cpp | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/ipacm/src/IPACM_Conntrack_NATApp.cpp b/ipacm/src/IPACM_Conntrack_NATApp.cpp index 27bf95a..4004597 100644 --- a/ipacm/src/IPACM_Conntrack_NATApp.cpp +++ b/ipacm/src/IPACM_Conntrack_NATApp.cpp @@ -1,5 +1,5 @@ /* -Copyright (c) 2013-2017, The Linux Foundation. All rights reserved. +Copyright (c) 2013-2018, The Linux Foundation. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are @@ -94,11 +94,7 @@ int NatApp::Init(void) } memset(pALGPorts, 0, sizeof(ipacm_alg) * nALGPort); - if(pConfig->GetAlgPorts(nALGPort, pALGPorts) != 0) - { - IPACMERR("Unable to retrieve ALG prots\n"); - goto fail; - } + pConfig->GetAlgPorts(nALGPort, pALGPorts); IPACMDBG("Printing %d alg ports information\n", nALGPort); for(int cnt=0; cnt<nALGPort; cnt++) @@ -106,12 +102,23 @@ int NatApp::Init(void) IPACMDBG("%d: Proto[%d], port[%d]\n", cnt, pALGPorts[cnt].protocol, pALGPorts[cnt].port); } } + else + { + IPACMERR("Unable to retrieve ALG prot count\n"); + goto fail; + } return 0; fail: - free(cache); - free(pALGPorts); + if(cache != NULL) + { + free(cache); + } + if(pALGPorts != NULL) + { + free(pALGPorts); + } return -1; } |