# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1600829001 14400
# Node ID d3643467d235d7656505320fd5e2043e70a23e2b
# Parent  d2ad5e0e5acabf5b117204267c61830368673ba9# Parent  2893db10b8d2628939adc8be7091111a7c10ce45
maint: merge stable to default.

diff -r d2ad5e0e5aca -r d3643467d235 libinterp/corefcn/call-stack.cc
--- a/libinterp/corefcn/call-stack.cc	Tue Sep 22 14:19:11 2020 -0400
+++ b/libinterp/corefcn/call-stack.cc	Tue Sep 22 22:43:21 2020 -0400
@@ -72,17 +72,19 @@
 
     octave_function *fcn = nullptr;
 
-    size_t idx = size ();
+    size_t idx = m_curr_frame;
 
-    if (idx > 1 && skip_first)
+    if (idx > 0 && skip_first)
       --idx;
 
-    while (--idx)
+    while (true)
       {
         fcn = m_cs[idx]->function ();
 
-        if (fcn)
+        if (fcn || idx == 0)
           break;
+
+        --idx;
       }
 
     return fcn;