include fixes and suggestions from code review

1 files changed, 5 insertions, 5 deletions

diff --git a/builtin.cpp b/builtin.cpp
index 30421de3..7df552e2 100644
--- a/builtin.cpp
+++ b/builtin.cpp
@@ -1010,12 +1010,12 @@ static int builtin_emit(parser_t &parser, wchar_t **argv)
 
     }
 
-    wcstring_list_t args;
-    wchar_t *eventname = argv[woptind];
-    for (woptind++; woptind < argc; woptind++)
-    {
-        args.push_back(argv[woptind]);
+    if(!argv[woptind]) {
+      append_format(stderr_buffer, L"%ls: expected event name\n", argv[0]);
+      return STATUS_BUILTIN_ERROR;
     }
+    wchar_t *eventname = argv[woptind];
+    wcstring_list_t args(argv + woptind + 1, argv + argc);
     event_fire_generic(eventname, &args);
 
     return STATUS_BUILTIN_OK;