From 613801cc554b3030aa1ce81a0f5d4ceb81e3ce74 Mon Sep 17 00:00:00 2001 From: Zack Middleton Date: Wed, 6 Nov 2013 22:23:33 -0600 Subject: Fix running if built on OS X 10.9 strncpy with in == out causes signal 6 if built on OS X 10.9. (If built on older OS X versions, the game works on 10.9 though.) It was happening in COM_StripExtension during map load. --- src/qcommon/q_shared.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/qcommon') diff --git a/src/qcommon/q_shared.c b/src/qcommon/q_shared.c index e70cd398..2c5d76d1 100644 --- a/src/qcommon/q_shared.c +++ b/src/qcommon/q_shared.c @@ -77,8 +77,12 @@ COM_StripExtension void COM_StripExtension( const char *in, char *out, int destsize ) { const char *dot = strrchr(in, '.'), *slash; + if (dot && (!(slash = strrchr(in, '/')) || slash < dot)) - Q_strncpyz(out, in, (destsize < dot-in+1 ? destsize : dot-in+1)); + destsize = (destsize < dot-in+1 ? destsize : dot-in+1); + + if ( in == out && destsize > 1 ) + out[destsize-1] = '\0'; else Q_strncpyz(out, in, destsize); } -- cgit