# HG changeset patch
# User Markus Mützel <markus.muetzel@gmx.de>
# Date 1603385974 -7200
# Node ID a6b7085c8ac258a23d7dce0631b2504869e390bb
# Parent  08a01acc2fcf5eab9d5b533ed9c6c6d73a953033# Parent  6d37fa1a786ef32ad38e95b5bdd433aa41128b6e
maint: merge stable to default.

diff -r 08a01acc2fcf -r a6b7085c8ac2 libinterp/corefcn/ls-mat5.cc
--- a/libinterp/corefcn/ls-mat5.cc	Fri Jul 03 17:56:48 2015 -0500
+++ b/libinterp/corefcn/ls-mat5.cc	Thu Oct 22 18:59:34 2020 +0200
@@ -980,20 +980,24 @@
             m2 = subsys_ov.scalar_map_value ();
             m2 = m2.contents ("MCOS").scalar_map_value ();
             tc2 = m2.contents ("MCOS").cell_value ()(1 + off).cell_value ()(1);
-            m2 = tc2.scalar_map_value ();
 
             octave::stack_frame::local_vars_map local_vars;
 
-            if (m2.nfields () > 0)
+            if (! tc2.isempty ())
               {
-                octave_value tmp;
-
-                for (auto p0 = m2.begin (); p0 != m2.end (); p0++)
+                m2 = tc2.scalar_map_value ();
+
+                if (m2.nfields () > 0)
                   {
-                    std::string key = m2.key (p0);
-                    octave_value val = m2.contents (p0);
-
-                    local_vars[key] = val;
+                    octave_value tmp;
+
+                    for (auto p0 = m2.begin (); p0 != m2.end (); p0++)
+                      {
+                        std::string key = m2.key (p0);
+                        octave_value val = m2.contents (p0);
+
+                        local_vars[key] = val;
+                      }
                   }
               }