Accepting request 652024 from network

OBS-URL: https://build.opensuse.org/request/show/652024
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openvswitch?expand=0&rev=34

0001-python-c-ext-Fix-memory-leak-in-Parser_finish.patch

@@ -0,0 +1,28 @@
+From e120ff1f8e4dbb0b889b26e0be082376a32090bc Mon Sep 17 00:00:00 2001
+From: Eric Lapointe <elapointe@corsa.com>
+Date: Wed, 31 Oct 2018 12:11:42 -0400
+Subject: [PATCH] python-c-ext: Fix memory leak in Parser_finish
+
+The memory returned by json_parser_finish needs to be freed by the caller.
+
+Signed-off-by: Eric Lapointe <elapointe@corsa.com>
+Signed-off-by: Ben Pfaff <blp@ovn.org>
+---
+ python/ovs/_json.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/python/ovs/_json.c b/python/ovs/_json.c
+index 8b8402025..ef7bb4b8e 100644
+--- a/python/ovs/_json.c
++++ b/python/ovs/_json.c
+@@ -170,6 +170,7 @@ Parser_finish(json_ParserObject * self)
+     json = json_parser_finish(self->_parser);
+     self->_parser = NULL;
+     obj = json_to_python(json);
++    json_destroy(json);
+     return obj;
+ }
+ 
+-- 
+2.16.4
+

openvswitch.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Nov 26 11:07:30 UTC 2018 - jcaamano@suse.com
+
+- Backport upstream fix for python json parser memory leak (bsc#1116437)
+ * 0001-python-c-ext-Fix-memory-leak-in-Parser_finish.patch 
+
 -------------------------------------------------------------------
 Thu Nov  8 11:17:38 UTC 2018 - Markos Chandras <mchandras@suse.de>
 

openvswitch.spec

@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via https://bugs.opensuse.org/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 # needssslcertforbuild
 
@@ -53,6 +53,8 @@ Url:            http://openvswitch.org/
 Source0:        http://openvswitch.org/releases/openvswitch-%{version}.tar.gz
 Source1:        preamble
 Source89:       Module.supported.updates
+# PATCH-FIX-UPSTREAM: 0001-python-c-ext-Fix-memory-leak-in-Parser_finish.patch
+Patch0:         0001-python-c-ext-Fix-memory-leak-in-Parser_finish.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  graphviz
@@ -317,6 +319,7 @@ performance and connectivity issues in Open vSwitch setup.
 
 %prep
 %setup -q -n openvswitch-%{version}
+%patch0 -p1
 
 %build
 set -- * .travis* .mailmap