From Jean-Louis Charton: clean up in some failure cases on AIX.

2 files changed, 4 insertions, 0 deletions

diff --git a/CREDITS b/CREDITS
index 5d0b376..1ed5b66 100644
--- a/CREDITS
+++ b/CREDITS
@@ -54,6 +54,7 @@ Additional people who have contributed patches:
 	Jason R. Thorpe			<thorpej at netbsd dot org>
 	Javier Achirica			<achirica at ttd dot net>
 	Jean Tourrilhes			<jt at hpl dot hp dot com>
+	Jean-Louis Charton		<Jean-Louis.CHARTON at oikialog dot com>
 	Jefferson Ogata			<jogata at nodc dot noaa dot gov>
 	Jesper Peterson			<jesper at endace dot com>
 	Joerg Mayer			<jmayer at loplof dot de>
diff --git a/pcap-bpf.c b/pcap-bpf.c
index 066264f..dd8ed93 100644
--- a/pcap-bpf.c
+++ b/pcap-bpf.c
@@ -1022,6 +1022,7 @@ bpf_odminit(char *errbuf)
 		snprintf(errbuf, PCAP_ERRBUF_SIZE,
 		    "bpf_load: odm_lock of /etc/objrepos/config_lock failed: %s",
 		    errstr);
+		(void)odm_terminate();
 		return (PCAP_ERROR);
 	}
 
@@ -1080,6 +1081,7 @@ bpf_load(char *errbuf)
 	if (major == -1) {
 		snprintf(errbuf, PCAP_ERRBUF_SIZE,
 		    "bpf_load: genmajor failed: %s", pcap_strerror(errno));
+		(void)bpf_odmcleanup(errbuf);
 		return (PCAP_ERROR);
 	}
 
@@ -1090,6 +1092,7 @@ bpf_load(char *errbuf)
 			snprintf(errbuf, PCAP_ERRBUF_SIZE,
 			    "bpf_load: genminor failed: %s",
 			    pcap_strerror(errno));
+			(void)bpf_odmcleanup(errbuf);
 			return (PCAP_ERROR);
 		}
 	}