[netfilter-cvslog] r7493 - trunk/iptables

[kaber at trash.net]

Author: kaber at trash.net
Date: 2008-04-15 15:51:19 +0200 (Tue, 15 Apr 2008)
New Revision: 7493

Modified:
   trunk/iptables/ip6tables.c
Log:
Properly initialize revision for ip6tables targets

Also resync error handling with iptables.


Modified: trunk/iptables/ip6tables.c
===================================================================
--- trunk/iptables/ip6tables.c	2008-04-15 12:01:06 UTC (rev 7492)
+++ trunk/iptables/ip6tables.c	2008-04-15 13:51:19 UTC (rev 7493)
@@ -1393,9 +1393,16 @@
 				target->t = fw_calloc(1, size);
 				target->t->u.target_size = size;
 				strcpy(target->t->u.user.name, jumpto);
+				set_revision(target->t->u.user.name,
+					     target->revision);
 				if (target->init != NULL)
 					target->init(target->t);
-				opts = merge_options(opts, target->extra_opts, &target->option_offset);
+				opts = merge_options(opts,
+						     target->extra_opts,
+						     &target->option_offset);
+				if (opts == NULL)
+					exit_error(OTHER_PROBLEM,
+						   "can't alloc memory!");
 			}
 			break;