[Midnightbsd-cvs] src [10837] trunk/lib/libjail: tag

[laffer1 at midnightbsd.org]

Revision: 10837
          http://svnweb.midnightbsd.org/src/?rev=10837
Author:   laffer1
Date:     2018-06-12 20:31:25 -0400 (Tue, 12 Jun 2018)
Log Message:
-----------
tag

Modified Paths:
--------------
    trunk/lib/libjail/Makefile
    trunk/lib/libjail/jail.3
    trunk/lib/libjail/jail.c
    trunk/lib/libjail/jail.h
    trunk/lib/libjail/jail_getid.c

Property Changed:
----------------
    trunk/lib/libjail/jail.3

Modified: trunk/lib/libjail/Makefile
===================================================================
--- trunk/lib/libjail/Makefile	2018-06-13 00:30:53 UTC (rev 10836)
+++ trunk/lib/libjail/Makefile	2018-06-13 00:31:25 UTC (rev 10837)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/lib/libjail/Makefile 201381 2010-01-02 09:58:07Z ed $
 
 LIB=	jail
 SHLIBDIR?= /lib

Modified: trunk/lib/libjail/jail.3
===================================================================
--- trunk/lib/libjail/jail.3	2018-06-13 00:30:53 UTC (rev 10836)
+++ trunk/lib/libjail/jail.3	2018-06-13 00:31:25 UTC (rev 10837)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
 .\" Copyright (c) 2009 James Gritton.
 .\" All rights reserved.
 .\"
@@ -22,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: stable/10/lib/libjail/jail.3 213572 2010-10-08 12:39:49Z uqs $
 .\"
 .Dd August 31, 2010
 .Dt JAIL 3


Property changes on: trunk/lib/libjail/jail.3
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/lib/libjail/jail.c
===================================================================
--- trunk/lib/libjail/jail.c	2018-06-13 00:30:53 UTC (rev 10836)
+++ trunk/lib/libjail/jail.c	2018-06-13 00:31:25 UTC (rev 10837)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2009 James Gritton.
  * All rights reserved.
@@ -25,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/lib/libjail/jail.c 241197 2012-10-04 19:07:05Z jamie $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -85,19 +86,22 @@
 		(void)va_arg(tap, char *);
 	va_end(tap);
 	jp = alloca(njp * sizeof(struct jailparam));
-	for (njp = 0; (name = va_arg(ap, char *)) != NULL; njp++) {
+	for (njp = 0; (name = va_arg(ap, char *)) != NULL;) {
 		value = va_arg(ap, char *);
-		if (jailparam_init(jp + njp, name) < 0 ||
-		    jailparam_import(jp + njp, value) < 0) {
-			jailparam_free(jp, njp);
-			va_end(ap);
-			return (-1);
-		}
+		if (jailparam_init(jp + njp, name) < 0)
+			goto error;
+		if (jailparam_import(jp + njp++, value) < 0)
+			goto error;
 	}
 	va_end(ap);
 	jid = jailparam_set(jp, njp, flags);
 	jailparam_free(jp, njp);
 	return (jid);
+
+ error:
+	jailparam_free(jp, njp);
+	va_end(ap);
+	return (-1);
 }
 
 /*
@@ -195,7 +199,7 @@
 int
 jailparam_all(struct jailparam **jpp)
 {
-	struct jailparam *jp;
+	struct jailparam *jp, *tjp;
 	size_t mlen1, mlen2, buflen;
 	int njp, nlist;
 	int mib1[CTL_MAXNAME], mib2[CTL_MAXNAME - 2];
@@ -242,11 +246,10 @@
 		/* Add the parameter to the list */
 		if (njp >= nlist) {
 			nlist *= 2;
-			jp = realloc(jp, nlist * sizeof(*jp));
-			if (jp == NULL) {
-				jailparam_free(jp, njp);
-				return (-1);
-			}
+			tjp = realloc(jp, nlist * sizeof(*jp));
+			if (tjp == NULL)
+				goto error;
+			jp = tjp;
 		}
 		if (jailparam_init(jp + njp, buf + sizeof(SJPARAM)) < 0)
 			goto error;
@@ -277,6 +280,8 @@
 	}
 	if (jailparam_type(jp) < 0) {
 		jailparam_free(jp, 1);
+		jp->jp_name = NULL;
+		jp->jp_value = NULL;
 		return (-1);
 	}
 	return (0);

Modified: trunk/lib/libjail/jail.h
===================================================================
--- trunk/lib/libjail/jail.h	2018-06-13 00:30:53 UTC (rev 10836)
+++ trunk/lib/libjail/jail.h	2018-06-13 00:31:25 UTC (rev 10837)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2009 James Gritton.
  * All rights reserved.
@@ -23,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: stable/10/lib/libjail/jail.h 195870 2009-07-25 14:48:57Z jamie $
  */
 
 #ifndef _JAIL_H

Modified: trunk/lib/libjail/jail_getid.c
===================================================================
--- trunk/lib/libjail/jail_getid.c	2018-06-13 00:30:53 UTC (rev 10836)
+++ trunk/lib/libjail/jail_getid.c	2018-06-13 00:31:25 UTC (rev 10837)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2009 James Gritton.
  * All rights reserved.
@@ -25,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/lib/libjail/jail_getid.c 210134 2010-07-15 19:21:33Z jamie $");
 
 #include <sys/param.h>
 #include <sys/types.h>