SHA256
1
0
forked from pool/libupnp

Accepting request 827357 from devel:libraries:c_c++

- Update to release 1.14.0

OBS-URL: https://build.opensuse.org/request/show/827357
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libupnp?expand=0&rev=21
This commit is contained in:
Dominique Leuenberger 2020-08-20 20:26:35 +00:00 committed by Git OBS Bridge
commit b41b73c88e
8 changed files with 16 additions and 62 deletions

View File

@ -1,54 +0,0 @@
From c805c1de1141cb22f74c0d94dd5664bda37398e0 Mon Sep 17 00:00:00 2001
From: Marcelo Roberto Jimenez <marcelo.jimenez@gmail.com>
Date: Thu, 4 Jun 2020 12:03:03 -0300
Subject: [PATCH] Fixes #177: NULL pointer dereference in
FindServiceControlURLPath
References: https://bugzilla.opensuse.org/show_bug.cgi?id=1172625
Also fixes its dual bug in FindServiceEventURLPath.
---
ChangeLog | 6 ++++++
upnp/src/genlib/service_table/service_table.c | 6 ++++++
2 files changed, 12 insertions(+)
Index: libupnp-1.12.1/ChangeLog
===================================================================
--- libupnp-1.12.1.orig/ChangeLog
+++ libupnp-1.12.1/ChangeLog
@@ -32,6 +32,12 @@ Version 1.12.1
List: Add extern C for C++ users
+2020-06-04 Patrik Lantz pjlantz(at)github
+
+ Fixes #177
+
+ NULL pointer dereference in FindServiceControlURLPath
+
*******************************************************************************
Version 1.12.0
*******************************************************************************
Index: libupnp-1.12.1/upnp/src/genlib/service_table/service_table.c
===================================================================
--- libupnp-1.12.1.orig/upnp/src/genlib/service_table/service_table.c
+++ libupnp-1.12.1/upnp/src/genlib/service_table/service_table.c
@@ -300,6 +300,9 @@ FindServiceEventURLPath( service_table *
uri_type parsed_url;
uri_type parsed_url_in;
+ if (!table || !eventURLPath) {
+ return NULL;
+ }
if( ( table )
&&
( parse_uri( eventURLPath,
@@ -352,6 +355,9 @@ FindServiceControlURLPath( service_table
uri_type parsed_url;
uri_type parsed_url_in;
+ if (!table || !controlURLPath) {
+ return NULL;
+ }
if( ( table )
&&
( parse_uri

View File

@ -1,2 +1,2 @@
libupnp16 libupnp17
libixml11 libixml11

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fc36642b1848fe5a81296d496291d350ecfc12b85fd0b268478ab230976d4009
size 681174

View File

@ -1 +0,0 @@
08fd7ec2d77ff4e7bc4632bf30695c7af63820ee libupnp-1.12.1.tar.bz2

3
libupnp-1.14.0.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ecb23d4291968c8a7bdd4eb16fc2250dbacc16b354345a13342d67f571d35ceb
size 672409

View File

@ -0,0 +1 @@
b14cff9ddd7cfe7f0e4bf552387122a31770f51f libupnp-1.14.0.tar.bz2

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Sun Aug 16 15:27:31 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
- Update to release 1.14.0
* Remove deprecated "UpnpInit" function
* Reworked the miniserver code to deal with SO_REUSEADDR
- Drop 0001-Fixes-177-NULL-pointer-dereference-in-FindServiceCon.patch
(merged)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jun 9 19:08:27 UTC 2020 - Jan Engelhardt <jengelh@inai.de> Tue Jun 9 19:08:27 UTC 2020 - Jan Engelhardt <jengelh@inai.de>

View File

@ -17,10 +17,10 @@
# #
%define pnpver 16 %define pnpver 17
%define ixmlver 11 %define ixmlver 11
Name: libupnp Name: libupnp
Version: 1.12.1 Version: 1.14.0
Release: 0 Release: 0
Summary: An implementation of Universal Plug and Play (UPnP) Summary: An implementation of Universal Plug and Play (UPnP)
License: BSD-3-Clause License: BSD-3-Clause
@ -29,7 +29,6 @@ URL: https://github.com/pupnp/pupnp
Source: https://github.com/pupnp/pupnp/releases/download/release-%version/%name-%version.tar.bz2 Source: https://github.com/pupnp/pupnp/releases/download/release-%version/%name-%version.tar.bz2
Source2: https://github.com/pupnp/pupnp/releases/download/release-%version/%name-%version.tar.bz2.sha1 Source2: https://github.com/pupnp/pupnp/releases/download/release-%version/%name-%version.tar.bz2.sha1
Source3: baselibs.conf Source3: baselibs.conf
Patch1: 0001-Fixes-177-NULL-pointer-dereference-in-FindServiceCon.patch
BuildRequires: libtool BuildRequires: libtool
BuildRequires: pkg-config BuildRequires: pkg-config