From 2fe55ca2829976ca41defe059395450f52ba4c6d Mon Sep 17 00:00:00 2001
From: John Halley Gotway <johnhg@ucar.edu>
Date: Thu, 17 Oct 2024 15:27:28 +0000
Subject: [PATCH] Per #2673, remove m_strlen() entirely.

---
 src/libcode/vx_python3_utils/wchar_argv.cc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/libcode/vx_python3_utils/wchar_argv.cc b/src/libcode/vx_python3_utils/wchar_argv.cc
index e3e0586a8..d0bd156f9 100644
--- a/src/libcode/vx_python3_utils/wchar_argv.cc
+++ b/src/libcode/vx_python3_utils/wchar_argv.cc
@@ -206,7 +206,10 @@ for (int j=0; j<_argc; ++j)  {
    // we're using the len array here because
    // we don't want to call m_strlen more than
    // once on each argv value
-   if (_argv) len[j] = m_strlen(_argv[j]);
+   if (_argv) {
+      string arg_str = _argv[j];
+      len[j] = arg_str.length();
+   }
 
    argv_len += len[j];