commit 498e61d5a4361d4a225947386ac8150292dcc466
author Elliott Hughes <enh@google.com> Tue May 10 15:03:41 2016 -0700
committer Elliott Hughes <enh@google.com> Tue May 10 15:03:41 2016 -0700
tree 6ca6b5bca6089b2d993c16f482ae85f3ab65d8f5
parent d9417c06308cf9dd34941ca338ac31a9df54b42a
parent 4e756d7f9fd1b32b545ce8c43120dc733653b52f

Merge remote-tracking branch 'toybox/master' into HEAD

main.c

diff --git a/main.c b/main.c
index 9c70c96..eeae2f3 100644
--- a/main.c
+++ b/main.c
@@ -137,8 +137,11 @@
   if (!(which = toy_find(*argv))) return;
 
   // Return if stack depth getting noticeable (proxy for leaked heap, etc).
-  if (toys.stacktop && labs((char *)toys.stacktop-(char *)&which)>6000)
-    return;
+
+  // Compiler writers have decided subtracting char * is undefined behavior,
+  // so convert to integers. (LP64 says sizeof(long)==sizeof(pointer).)
+  if (!CFG_TOYBOX_NORECURSE)
+    if (toys.stacktop && labs((long)toys.stacktop-(long)&which)>6000) return;
 
   // Return if we need to re-exec to acquire root via suid bit.
   if (toys.which && (which->flags&TOYFLAG_ROOTONLY) && toys.wasroot) return;