Mercurial > octave

changeset 30349:5c6c5c8bbefd stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mxAddField: Allow keys to contain any characters (bug #61537) * mex.cc (mxArray_struct::add_field): Don't validate key. (valid_key): Delete unused static function.
author John W. Eaton <jwe@octave.org>
date Wed, 24 Nov 2021 13:15:18 -0500
parents 29efaa1d32d7
children e27be169feff 4f4fa00edada 212461a26e9c
files libinterp/corefcn/mex.cc
diffstat 1 files changed, 33 insertions(+), 60 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/mex.cc	Wed Nov 24 19:09:14 2021 +0100
+++ b/libinterp/corefcn/mex.cc	Wed Nov 24 13:15:18 2021 -0500
@@ -277,30 +277,6 @@
   return max_len;
 }
 
-static int
-valid_key (const char *key)
-{
-  int retval = 0;
-
-  int nel = strlen (key);
-
-  if (nel > 0)
-    {
-      if (isalpha (key[0]))
-        {
-          for (int i = 1; i < nel; i++)
-            {
-              if (! (isalnum (key[i]) || key[i] == '_'))
-                return retval;
-            }
-
-          retval = 1;
-        }
-    }
-
-  return retval;
-}
-
 // ------------------------------------------------------------------
 
 mxArray_base::mxArray_base (bool interleaved)
@@ -2767,48 +2743,45 @@
   {
     int retval = -1;
 
-    if (valid_key (key))
+    m_nfields++;
+
+    m_fields = static_cast<char **>
+      (mxRealloc (m_fields, m_nfields * sizeof (char *)));
+
+    if (m_fields)
       {
-        m_nfields++;
-
-        m_fields = static_cast<char **>
-                    (mxRealloc (m_fields, m_nfields * sizeof (char *)));
-
-        if (m_fields)
+        m_fields[m_nfields-1] = mxArray::strsave (key);
+
+        mwSize nel = get_number_of_elements ();
+
+        mwSize ntot = m_nfields * nel;
+
+        mxArray **new_data;
+        new_data = static_cast<mxArray **>
+          (mxArray::malloc (ntot * sizeof (mxArray *)));
+
+        if (new_data)
           {
-            m_fields[m_nfields-1] = mxArray::strsave (key);
-
-            mwSize nel = get_number_of_elements ();
-
-            mwSize ntot = m_nfields * nel;
-
-            mxArray **new_data;
-            new_data = static_cast<mxArray **>
-                        (mxArray::malloc (ntot * sizeof (mxArray *)));
-
-            if (new_data)
+            mwIndex j = 0;
+            mwIndex k = 0;
+            mwIndex n = 0;
+
+            for (mwIndex i = 0; i < ntot; i++)
               {
-                mwIndex j = 0;
-                mwIndex k = 0;
-                mwIndex n = 0;
-
-                for (mwIndex i = 0; i < ntot; i++)
+                if (++n == m_nfields)
                   {
-                    if (++n == m_nfields)
-                      {
-                        new_data[j++] = nullptr;
-                        n = 0;
-                      }
-                    else
-                      new_data[j++] = m_data[k++];
+                    new_data[j++] = nullptr;
+                    n = 0;
                   }
-
-                mxFree (m_data);
-
-                m_data = new_data;
-
-                retval = m_nfields - 1;
+                else
+                  new_data[j++] = m_data[k++];
               }
+
+            mxFree (m_data);
+
+            m_data = new_data;
+
+            retval = m_nfields - 1;
           }
       }