From patchwork Sat Feb 7 13:59:53 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jamal X-Patchwork-Id: 22510 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id B70E7DDDE3 for ; Sun, 8 Feb 2009 01:01:50 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752199AbZBGOBo (ORCPT ); Sat, 7 Feb 2009 09:01:44 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752160AbZBGOBo (ORCPT ); Sat, 7 Feb 2009 09:01:44 -0500 Received: from mail-ew0-f21.google.com ([209.85.219.21]:58130 "EHLO mail-ew0-f21.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752089AbZBGOBo (ORCPT ); Sat, 7 Feb 2009 09:01:44 -0500 Received: by ewy14 with SMTP id 14so1825855ewy.13 for ; Sat, 07 Feb 2009 06:01:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:subject:from:reply-to :to:cc:content-type:date:message-id:mime-version:x-mailer; bh=Dmcn1iJRhAyJ8FgFd8IXFb9fsidNDXseSiSPDMnC8jI=; b=pe8r09n0tQgM9E2OxFN4GlG/+lZOfQTzkoRQmS7SwcbdRCS4C3KzzGhREU845ZE3IR ThaOwCpHdbbU+i+UWY4euKWomQvMUeAtZPQfvABZ4pF8ok0p0s1CnW2muCoVyEVMpOO/ 8fQaJ577bnJkwafrPXXT0kHtVh25lxzm34ClM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:subject:from:reply-to:to:cc:content-type:date:message-id :mime-version:x-mailer; b=ne91gIppsjZ286MHPHRSFBMF5xKhZT75djyFTB2I67A0Ntnx89AMj0p1FIIo/rVHee B2Yv8XTIHmdg0uTHOPxWmqBGsBEU6kvoOO/LAakOaOq03z35FO01BA1aznLNnkxua8Dt m1YefU982KzMe/qhSjLtYGkUVe9gsBp+0YDK4= Received: by 10.210.35.10 with SMTP id i10mr2223245ebi.104.1234015302196; Sat, 07 Feb 2009 06:01:42 -0800 (PST) Received: from ?10.0.0.31? (CPE0030ab124d2f-CM001bd7a7f1a0.cpe.net.cable.rogers.com [99.240.75.67]) by mx.google.com with ESMTPS id 28sm261745eyg.55.2009.02.07.06.01.40 (version=SSLv3 cipher=RC4-MD5); Sat, 07 Feb 2009 06:01:41 -0800 (PST) Subject: [PATCH] iproute2 : ipt - free local opts From: jamal Reply-To: hadi@cyberus.ca To: Stephen Hemminger Cc: netdev@vger.kernel.org, Denys Fedoryschenko Date: Sat, 07 Feb 2009 08:59:53 -0500 Message-Id: <1234015193.4441.8.camel@dogo.mojatatu.com> Mime-Version: 1.0 X-Mailer: Evolution 2.22.3.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org >From Denys Fedoryschenko This was left out in the last release. It is a bug fix for when batch files are used. cheers, jamal commit eb3c0ea70d7fd47c8a132f2e7a7dfce734c2394b Author: Denys Fedoryschenko Date: Sat Feb 7 08:49:32 2009 -0500 This change was forgotten by Stephen in the last release Signed-off-by: Denys Fedoryschenko Signed-off-by: Jamal Hadi Salim diff --git a/tc/m_ipt.c b/tc/m_ipt.c index f5b7b3c..5b98428 100644 --- a/tc/m_ipt.c +++ b/tc/m_ipt.c @@ -162,10 +162,10 @@ int string_to_number(const char *s, unsigned int min, unsigned int max, return result; } -static void free_opts(struct option *opts) +static void free_opts(struct option *local_opts) { - if (opts != original_opts) { - free(opts); + if (local_opts != original_opts) { + free(local_opts); opts = original_opts; global_option_offset = 0; }