diff options
| author | Bruno Martins <bgcngm@gmail.com> | 2018-05-08 22:19:05 +0100 |
|---|---|---|
| committer | Cosme Domínguez Díaz <cosme.ddiaz@gmail.com> | 2018-05-09 20:39:17 +0200 |
| commit | 045ad4c8846ab3e3a87f0a1b0682585c484f8fda (patch) | |
| tree | a93ec5702352587703272eccab2dd5b73dca981e /data-ipa-cfg-mgr/ipacm/src/IPACM_Conntrack_NATApp.cpp | |
| parent | acacc9391e359daf81bf5c3b406997c1808ac7fa (diff) | |
msm8996-common: Sync IPACM with upstream
* Tag: LA.UM.6.6.r1-08300-89xx.0
Change-Id: Ie4759d0919200e9b38dbc017d0798fccb97aabe5
Diffstat (limited to 'data-ipa-cfg-mgr/ipacm/src/IPACM_Conntrack_NATApp.cpp')
| -rw-r--r-- | data-ipa-cfg-mgr/ipacm/src/IPACM_Conntrack_NATApp.cpp | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/data-ipa-cfg-mgr/ipacm/src/IPACM_Conntrack_NATApp.cpp b/data-ipa-cfg-mgr/ipacm/src/IPACM_Conntrack_NATApp.cpp index c13c48e..04cdd16 100644 --- a/data-ipa-cfg-mgr/ipacm/src/IPACM_Conntrack_NATApp.cpp +++ b/data-ipa-cfg-mgr/ipacm/src/IPACM_Conntrack_NATApp.cpp @@ -1,5 +1,5 @@ /* -Copyright (c) 2013-2016, 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 @@ -90,11 +90,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++) @@ -102,12 +98,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; } |