[ysh builtin translation] Avoid crash in promptVal()

oilshell · Jan 30, 2024 · 7e1d31f · 7e1d31f
1 parent cf43b50
commit 7e1d31f
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 15 deletions.
diff --git a/builtin/meta_osh.py b/builtin/meta_osh.py
@@ -200,7 +200,8 @@ def _PrintFreeForm(row):
     if kind == 'file':
         what = resolved
     elif kind == 'alias':
-        what = ('an alias for %s' % j8_lite.EncodeString(resolved, unquoted_ok=True))
+        what = ('an alias for %s' %
+                j8_lite.EncodeString(resolved, unquoted_ok=True))
     else:  # builtin, function, keyword
         what = 'a shell %s' % kind
 

diff --git a/builtin/method_io.py b/builtin/method_io.py
@@ -3,6 +3,7 @@
 
 from _devbuild.gen.value_asdl import value, value_t
 
+from core import error
 from core import vm
 from mycpp.mylib import log
 from osh import prompt
@@ -32,5 +33,11 @@ def Call(self, rd):
         what = rd.PosStr()
         rd.Done()  # no more args
 
+        # Bug fix: protect against crash later in PromptVal()
+        if len(what) != 1:
+            raise error.Expr(
+                'promptVal() expected a single char, got %r' % what,
+                rd.LeftParenToken())
+
         prompt_ev = cast(prompt.Evaluator, io.prompt_ev)
         return value.Str(prompt_ev.PromptVal(what))
diff --git a/core/dev.py b/core/dev.py
@@ -575,7 +575,8 @@ def OnShAssignment(self, lval, op, val, flags, which_scopes):
                 left = '%s[%d]' % (lval.name, lval.index)
             elif case(sh_lvalue_e.Keyed):
                 lval = cast(sh_lvalue.Keyed, UP_lval)
-                left = '%s[%s]' % (lval.name, j8_lite.MaybeShellEncode(lval.key))
+                left = '%s[%s]' % (lval.name, j8_lite.MaybeShellEncode(
+                    lval.key))
         buf.write(left)
 
         # Only two possibilities here

diff --git a/data_lang/j8_lite.py b/data_lang/j8_lite.py
@@ -4,6 +4,7 @@
 
 import fastfunc  # Skip pyj8 and fastlex
 
+
 def EncodeString(s, unquoted_ok=False):
     # type: (str, bool) -> str
     """Convenience API that doesn't require instance of j8.Printer()
@@ -43,5 +44,3 @@ def YshEncode(s, unquoted_ok=False):
         return s
 
     return fastfunc.ShellEncodeString(s, 1)  # ysh_fallback
-
-
diff --git a/frontend/flag_def.py b/frontend/flag_def.py
@@ -468,11 +468,12 @@ def _DefineCompletionActions(spec):
 #   u means I want \u{1234}
 #   raw is utf-8
 if 0:
-    WRITE_SPEC.LongFlag('--unicode', ['raw', 'u', 'x'],
-                        default='raw',
-                        help='Encode QSN with these options.  '
-                        'x assumes an opaque byte string, while raw and u try to '
-                        'decode UTF-8.')
+    WRITE_SPEC.LongFlag(
+        '--unicode', ['raw', 'u', 'x'],
+        default='raw',
+        help='Encode QSN with these options.  '
+        'x assumes an opaque byte string, while raw and u try to '
+        'decode UTF-8.')
 
 PUSH_REGISTERS_SPEC = FlagSpec('push-registers')
 

diff --git a/mycpp/NINJA_subgraph.py b/mycpp/NINJA_subgraph.py
@@ -163,12 +163,14 @@ def TranslatorSubgraph(ru, translator, ex):
     # But don't pass it on the command line.
     translator_wrapper = '_bin/shwrap/%s_main' % translator
 
-    n.build(raw,
-            'translate-%s' % translator,
-            to_translate,
-            implicit=[translator_wrapper],
-            # examples/parse uses pyext/fastfunc.pyi
-            variables=[('mypypath', '$NINJA_REPO_ROOT/mycpp:$NINJA_REPO_ROOT/pyext')])
+    n.build(
+        raw,
+        'translate-%s' % translator,
+        to_translate,
+        implicit=[translator_wrapper],
+        # examples/parse uses pyext/fastfunc.pyi
+        variables=[('mypypath',
+                    '$NINJA_REPO_ROOT/mycpp:$NINJA_REPO_ROOT/pyext')])
 
     p = 'mycpp/examples/%s_preamble.h' % ex
     # Ninja empty string!