[asan]: Fix signal handler. (sonic-net#2255)

nazariig · web-flow · commit 39e8996f8c6b · 2022-05-04T10:43:41.000-07:00
* Fix compilation for natmgrd signal handler
Signed-off-by: Nazarii Hnydyn &lt;nazariig@nvidia.com&gt;
diff --git a/cfgmgr/natmgrd.cpp b/cfgmgr/natmgrd.cpp
@@ -72,6 +72,10 @@ void sigterm_handler(int signo)
 {
     SWSS_LOG_ENTER();
 
+    if (old_sigaction.sa_handler != SIG_IGN && old_sigaction.sa_handler != SIG_DFL) {
+        old_sigaction.sa_handler(signo);
+    }
+
     gExit = 1;
 }
 
@@ -109,10 +113,6 @@ void cleanup()
         natmgr->cleanupMangleIpTables();
         natmgr->cleanupPoolIpTable();
     }
-
-    if (old_sigaction.sa_handler != SIG_IGN && old_sigaction.sa_handler != SIG_DFL) {
-        old_sigaction.sa_handler(signo);
-    }
 }
 
 int main(int argc, char **argv)

Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,10 @@ void sigterm_handler(int signo)`
`72`	`72`	`{`
`73`	`73`	`SWSS_LOG_ENTER();`
`74`	`74`
	`75`	`+ if (old_sigaction.sa_handler != SIG_IGN && old_sigaction.sa_handler != SIG_DFL) {`
	`76`	`+ old_sigaction.sa_handler(signo);`
	`77`	`+ }`
	`78`	`+`
`75`	`79`	`gExit = 1;`
`76`	`80`	`}`
`77`	`81`
`@@ -109,10 +113,6 @@ void cleanup()`
`109`	`113`	`natmgr->cleanupMangleIpTables();`
`110`	`114`	`natmgr->cleanupPoolIpTable();`
`111`	`115`	`}`
`112`		`-`
`113`		`- if (old_sigaction.sa_handler != SIG_IGN && old_sigaction.sa_handler != SIG_DFL) {`
`114`		`- old_sigaction.sa_handler(signo);`
`115`		`- }`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`int main(int argc, char **argv)`