Date: Mon, 30 May 2016 13:30:11 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r416153 - in branches/2016Q2/games/burrtools: . files Message-ID: <201605301330.u4UDUBAU092885@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Mon May 30 13:30:10 2016 New Revision: 416153 URL: https://svnweb.freebsd.org/changeset/ports/416153 Log: MFH: r416147 games/burrtools: switch back to clang on 10+ Fix undefined behavior on startup when parsing (embedded) config file written in Lua. Approved by: ports-secteam (junovitch) Added: branches/2016Q2/games/burrtools/files/patch-undefined - copied unchanged from r416147, head/games/burrtools/files/patch-undefined Modified: branches/2016Q2/games/burrtools/Makefile Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/games/burrtools/Makefile ============================================================================== --- branches/2016Q2/games/burrtools/Makefile Mon May 30 13:20:49 2016 (r416152) +++ branches/2016Q2/games/burrtools/Makefile Mon May 30 13:30:10 2016 (r416153) @@ -3,7 +3,7 @@ PORTNAME= burrtools PORTVERSION= 0.6.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= SF @@ -21,7 +21,6 @@ LIB_DEPENDS= libboost_system.so:devel/bo USES= gmake USE_XORG= x11 xt xext xmu xi USE_GL= glu -USE_GCC= yes # clang generates incorrect binaries: cause SIGILL GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-silent-rules @@ -37,12 +36,6 @@ DESKTOP_ENTRIES="BurrGui" "" "${PREFIX}/ OPTIONS_DEFINE= DOCS EXAMPLES -.include <bsd.port.options.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000024 -LDFLAGS+= -lc++ -.endif - post-patch: @${REINPLACE_CMD} -e \ 's|g++ |$$(CXX) | ; \ Copied: branches/2016Q2/games/burrtools/files/patch-undefined (from r416147, head/games/burrtools/files/patch-undefined) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q2/games/burrtools/files/patch-undefined Mon May 30 13:30:10 2016 (r416153, copy of r416147, head/games/burrtools/files/patch-undefined) @@ -0,0 +1,54 @@ +Found by -fsanitize=undefined as + + $ burrGui + lua/luaclass.cpp:60:17: runtime error: execution reached the end of a value-returning function without returning a value + +which with Clang leads to + + * thread #1: tid = 100272, 0x00000000005d0d2d burrGui`luaClass_c::doString(this=0x00007fffffffd6e0, code="windowposh = 600") + 125 at luaclass.cpp:61, stop reason = signal SIGILL: privileged instruction + frame #0: 0x00000000005d0d2d burrGui`luaClass_c::doString(this=0x00007fffffffd6e0, code="windowposh = 600") + 125 at luaclass.cpp:61 + 58 luaL_loadfile(L, fname) || lua_pcall(L, 0, 0, 0); + 59 } + 60 int luaClass_c::doString(const char *code) { + -> 61 luaL_loadbuffer(L, code, strlen(code), "line") || lua_pcall(L, 0, 0, 0); + 62 } + 63 + 64 /* functions that allow calling lua functions + (lldb) bt + * thread #1: tid = 100272, 0x00000000005d0d2d burrGui`luaClass_c::doString(this=0x00007fffffffd6e0, code="windowposh = 600") + 125 at luaclass.cpp:61, stop reason = signal SIGILL: privileged instruction + * frame #0: 0x00000000005d0d2d burrGui`luaClass_c::doString(this=0x00007fffffffd6e0, code="windowposh = 600") + 125 at luaclass.cpp:61 + frame #1: 0x0000000000416735 burrGui`configuration_c::parse(this=0x00000000008e5a18) + 165 at configuration.cpp:65 + frame #2: 0x0000000000416fbb burrGui`configuration_c::configuration_c(this=0x00000000008e5a18) + 939 at configuration.cpp:144 + frame #3: 0x0000000000417877 burrGui`::__cxx_global_var_init() + 23 at configuration.cpp:266 + frame #4: 0x00000000004178b9 burrGui`_GLOBAL__sub_I_configuration.cpp + 9 at configuration.cpp:0 + frame #5: 0x00000000006221e2 burrGui`__do_global_ctors_aux + 34 + frame #6: 0x000000000040e986 burrGui + +--- src/lua/luaclass.cpp.orig 2013-05-08 19:02:06 UTC ++++ src/lua/luaclass.cpp +@@ -54,10 +54,10 @@ bool luaClass_c::getBool(const char *nam + } + + /* functions to evaluate lua code */ +-int luaClass_c::doFile(const char *fname) { ++void luaClass_c::doFile(const char *fname) { + luaL_loadfile(L, fname) || lua_pcall(L, 0, 0, 0); + } +-int luaClass_c::doString(const char *code) { ++void luaClass_c::doString(const char *code) { + luaL_loadbuffer(L, code, strlen(code), "line") || lua_pcall(L, 0, 0, 0); + } + +--- src/lua/luaclass.h.orig 2013-05-08 19:02:06 UTC ++++ src/lua/luaclass.h +@@ -45,8 +45,8 @@ class luaClass_c { + bool getBool(const char *name); + + /* functions to evaluate lua code */ +- int doFile(const char *fname); +- int doString(const char *code); ++ void doFile(const char *fname); ++ void doString(const char *code); + + /* functions that allow calling lua functions + *
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605301330.u4UDUBAU092885>