cami: Check for and prevent resource leaks.

* Also test simpleami under valgrind.
* Upgrade from actions/checkout@v4 to v6.
* Fix duplicate fd closure in ami_cleanup.

Author: InterLinked1

.github/workflows/main.yml

@@ -12,16 +12,16 @@ on:
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  debian-12:
+  debian-13:
     runs-on: ubuntu-latest
-    name: Debian 12
-    container: debian:12
+    name: Debian 13
+    container: debian:13
     steps:
       - name: Build Asterisk
         run: |
           cd /usr/src
           apt-get update -y
-          apt-get install -y wget
+          apt-get install -y wget valgrind
           wget https://raw.githubusercontent.com/InterLinked1/phreakscript/refs/heads/master/phreaknet.sh
           chmod +x phreaknet.sh
           ./phreaknet.sh make
@@ -39,20 +39,21 @@ jobs:
           /etc/init.d/asterisk restart
           sleep 3
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - name: Build CAMI and execute simple demo
         run: |
           make
           make install
           make examples
           ./simpleami
+          valgrind --error-exitcode=1 ./simpleami
   fedora-42:
     runs-on: ubuntu-24.04
     name: Fedora 42
     container: fedora:42
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - name: Build CAMI
         run: |
           dnf install -y make gcc openssl-devel
@@ -65,7 +66,7 @@ jobs:
     container: fedora:42
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - name: Build CAMI
         run: |
           dnf install -y make gcc
@@ -77,7 +78,7 @@ jobs:
     runs-on: ubuntu-24.04
     name: FreeBSD
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Build CAMI
         uses: vmactions/freebsd-vm@v1
         with:

cami.c

@@ -145,26 +145,32 @@ static int maxwaitms = AMI_MAX_WAIT_TIME;
 static void *ami_event_dispatch(void *varg);
 static void ami_event_handle(struct ami_session *ami, char *data);
 
+#define CLOSE(fd) close(fd); fd = -1;
+
 static void close_pipes(struct ami_session *ami)
 {
-	close(ami->ami_pipe[1]);
-	close(ami->ami_read_pipe[1]);
-	close(ami->ami_event_pipe[1]);
+	CLOSE(ami->ami_pipe[1]);
+	CLOSE(ami->ami_read_pipe[1]);
+	CLOSE(ami->ami_event_pipe[1]);
 
-	close(ami->ami_pipe[0]);
-	close(ami->ami_read_pipe[0]);
-	close(ami->ami_event_pipe[0]);
+	CLOSE(ami->ami_pipe[0]);
+	CLOSE(ami->ami_read_pipe[0]);
+	CLOSE(ami->ami_event_pipe[0]);
 }
 
 static void ami_cleanup(struct ami_session *ami)
 {
-	close_pipes(ami);
+	/* ami_cleanup is called from both ami_disconnect and ami_loop,
+	 * so we ensure not to close the pipes twice. */
+	if (ami->ami_event_pipe[0] != -1) {
+		close_pipes(ami);
+	}
 
 	/* Close read/write file descriptor, if it's the same.
 	 * If they are different, that means the application passed us file descriptors to use,
 	 * and we don't touch those. */
 	if (ami->ami_wfd == ami->ami_rfd && ami->ami_rfd != -1) {
-		close(ami->ami_rfd);
+		CLOSE(ami->ami_rfd);
 		ami->ami_rfd = -1;
 		ami->ami_wfd = -1;
 	}
@@ -503,7 +509,7 @@ static int common_init(struct ami_session *ami)
 	pthread_mutex_init(&ami->ami_read_lock, NULL);
 	pthread_mutex_lock(&ami->ami_read_lock);
 
-#define CLOSE_PIPE_PAIR(pipepair) close(pipepair[0]); close(pipepair[1]);
+#define CLOSE_PIPE_PAIR(pipepair) CLOSE(pipepair[0]); CLOSE(pipepair[1]);
 
 	/* If we can't make a pipe, forget about the socket. */
 	if (socketpair(AF_LOCAL, SOCK_STREAM, 0, ami->ami_pipe)) {