cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More fixes for null pointer references into server.c

Browse Source 
(upstream git commit 71893121fbce7762f5cd9e6a98c4ead7e5cd6211)
This commit is contained in:
dcoppa 2015-07-24 15:03:38 +00:00
parent fa2c7a4ab0
commit e73b3066bc
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
audio/umurmur/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.17 2015/07/10 17:30:29 dcoppa Exp $
# $OpenBSD: Makefile,v 1.18 2015/07/24 15:03:38 dcoppa Exp $
COMMENT = minimalistic Mumble server
@ -7,7 +7,7 @@ GH_ACCOUNT = fatbob313
GH_PROJECT = umurmur
GH_TAGNAME = ${V}
DISTNAME = ${GH_PROJECT}-${V}
REVISION = 0
CATEGORIES = audio
HOMEPAGE = https://code.google.com/p/umurmur/

16
audio/umurmur/patches/patch-src_server_c
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-src_server_c,v 1.3 2015/07/10 17:30:30 dcoppa Exp $
$OpenBSD: patch-src_server_c,v 1.4 2015/07/24 15:03:38 dcoppa Exp $
commit c2eec4582ad6f5f759d8b9a3c7f9bf78aa59f656
Author: Felix Morgner <felix.morgner@gmail.com>
@ -6,8 +6,14 @@ Date: Mon Jul 6 11:20:34 2015 +0200
Fixed mutiple possible null-pointer derefences
commit 71893121fbce7762f5cd9e6a98c4ead7e5cd6211
Author: Omri Mor <omri50@gmail.com>
Date: Sun Jul 12 12:34:18 2015 +0300
Null pointer references
--- src/server.c.orig Sat Jun 20 00:58:46 2015
+++ src/server.c Fri Jul 10 19:04:32 2015
+++ src/server.c Fri Jul 24 16:51:57 2015
@@ -95,15 +95,22 @@ void checkIPversions()
struct sockaddr_storage** Server_setupAddressesAndPorts()
{
@ -16,14 +22,14 @@ Fixed mutiple possible null-pointer derefences
+ Log_fatal("Not enough memory to allocate addresses");
struct sockaddr_storage* v4address = calloc(1, sizeof(struct sockaddr_storage));
v4address->ss_family = AF_INET;
+ if(!v4address)
+ Log_fatal("Not enough memory to allocate IPv4 address");
v4address->ss_family = AF_INET;
+
struct sockaddr_storage* v6address = calloc(1, sizeof(struct sockaddr_storage));
v6address->ss_family = AF_INET6;
+ if(!v4address)
+ if(!v6address)
+ Log_fatal("Not enough memory to allocate IPv6 address");
v6address->ss_family = AF_INET6;
#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
- v4address->ss_len = sizeof(struct sockaddr_storage);