memcpy: fix segfault in times(NULL).

from Brad (maintainer)
This commit is contained in:
ajacoutot 2017-01-19 00:31:42 +00:00
parent 8dee490c6e
commit 08f6bed16f
2 changed files with 18 additions and 2 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.125 2016/08/30 10:20:15 jasper Exp $
# $OpenBSD: Makefile,v 1.126 2017/01/19 00:31:42 ajacoutot Exp $
COMMENT= multimedia decoding library
DISTNAME= xine-lib-1.2.6
REVISION= 6
REVISION= 7
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xine/}
EXTRACT_SUFX= .tar.xz

View File

@ -0,0 +1,16 @@
$OpenBSD: patch-src_xine-utils_memcpy_c,v 1.3 2017/01/19 00:31:42 ajacoutot Exp $
memcpy: fix segfault in times(NULL)
--- src/xine-utils/memcpy.c.orig Wed Jan 18 06:13:19 2017
+++ src/xine-utils/memcpy.c Wed Jan 18 06:13:59 2017
@@ -533,7 +533,8 @@ static int64_t rdtsc(int config_flags)
__asm__ volatile (".byte 0x0f, 0x31" : "=A" (x));
return x;
} else {
- return times(NULL);
+ struct tms tp;
+ return times(&tp);
}
}
#else