commit 1f6c41f150c600f064c1f60d5bdd19894ca73cc8
author Christopher Ferris <cferris@google.com> Tue Jan 12 01:43:34 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jan 12 01:43:34 2016 +0000
tree 6a3c4d7b85a6242a68dd8a6f923dadf6e0006f70
parent fb62c0aa93364992d2aef5b81b2f79c306efac47
parent c60f22c30ebf16ee4ab990994535f972f349e00e

Fix bug where a failure becomes success on x86.
am: c60f22c30e

* commit 'c60f22c30ebf16ee4ab990994535f972f349e00e':
  Fix bug where a failure becomes success on x86.

src/aarch64/Gstep.c

diff --git a/src/aarch64/Gstep.c b/src/aarch64/Gstep.c
index 3f5e8ad..5833ce2 100644
--- a/src/aarch64/Gstep.c
+++ b/src/aarch64/Gstep.c
@@ -164,7 +164,7 @@
   if (unlikely (ret == -UNW_ESTOPUNWIND))
     return ret;
 
-  if (unlikely (ret < 0))
+  if (unlikely (ret <= 0))
     return 0;
 
   return (c->dwarf.ip == 0) ? 0 : 1;

src/x86/Gstep.c

diff --git a/src/x86/Gstep.c b/src/x86/Gstep.c
index a1368eb..308f220 100644
--- a/src/x86/Gstep.c
+++ b/src/x86/Gstep.c
@@ -130,7 +130,8 @@
       c->dwarf.frame++;
     }
   /* End of ANDROID update. */
-  ret = (c->dwarf.ip == 0) ? 0 : 1;
-  Debug (2, "returning %d\n", ret);
-  return ret;
+  if (unlikely (ret <= 0))
+    return 0;
+
+  return (c->dwarf.ip == 0) ? 0 : 1;
 }