kurt forgot to add his patch:
- fix 64-bit segfault in recently_used_file_handler.cxx/set_timestamp() caused by sscanf "%ld" -> time_t sized var.
This commit is contained in:
parent
38ab2edf94
commit
65de62e6cd
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.20 2009/06/04 18:32:17 kurt Exp $
|
||||
# $OpenBSD: Makefile,v 1.21 2009/06/09 08:18:00 robert Exp $
|
||||
|
||||
ONLY_FOR_ARCHS= amd64 i386
|
||||
|
||||
@ -10,7 +10,7 @@ VERSION= 3.1.0
|
||||
DISTNAME= OOo_${VERSION}
|
||||
WRKDIST= ${WRKDIR}/OOO310_m11
|
||||
PKGNAME= openoffice-${VERSION}
|
||||
PKGNAME-main= openoffice-${VERSION}p3
|
||||
PKGNAME-main= openoffice-${VERSION}p4
|
||||
PKGNAME-kde= openoffice-kde-${VERSION}
|
||||
PKGNAME-java= openoffice-java-${VERSION}
|
||||
CATEGORIES= editors productivity
|
||||
|
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-shell_source_unix_sysshell_recently_used_file_handler_cxx,v 1.1 2009/06/09 08:18:01 robert Exp $
|
||||
--- shell/source/unix/sysshell/recently_used_file_handler.cxx.orig.port Tue Jun 9 10:05:19 2009
|
||||
+++ shell/source/unix/sysshell/recently_used_file_handler.cxx Tue Jun 9 10:05:38 2009
|
||||
@@ -114,7 +114,7 @@ namespace /* private */ {
|
||||
void set_timestamp(const string_t& character)
|
||||
{
|
||||
time_t t;
|
||||
- if (sscanf(character.c_str(), "%ld", &t) != 1)
|
||||
+ if (sscanf(character.c_str(), "%d", &t) != 1)
|
||||
timestamp_ = -1;
|
||||
else
|
||||
timestamp_ = t;
|
Loading…
Reference in New Issue
Block a user