COMMON: INPUT crash #99

Author: chrisws

ChangeLog

@@ -1,3 +1,7 @@
+2020-05-04 (0.12.19)
+	INPUT crash #99
+	Fix compile warning with updated gcc
+
 2020-03-07 (0.12.19)
 	COMMON: implement DEFINEKEY undo #92
 	UI: added R157 colour theme #94

configure.ac

@@ -74,8 +74,8 @@ function checkDebugMode() {
    AC_MSG_RESULT([$with_debug])
    if test "$with_debug" = "yes" || test "$with_debug" = "full"
    then
-     CFLAGS="${CFLAGS} -g -O0"
-     CXXFLAGS="${CXXFLAGS} -g -O0"
+     CFLAGS="${CFLAGS} -g -O0 -fstack-protector-all"
+     CXXFLAGS="${CXXFLAGS} -g -O0 -fstack-protector-all"
      AC_DEFINE(_DEBUG, 1, [debugging build enabled])
    fi
    AC_SUBST(CFLAGS)

samples/distro-examples/tests/keymap.bas

@@ -32,3 +32,4 @@ if (instr(sbver, "SDL") <> 0) then
   wend
 endif
 
+print "done"

samples/distro-examples/tests/output/input.out

@@ -0,0 +1 @@
+1.11111111111111E+74

samples/distro-examples/tests/output/keymap.out

@@ -0,0 +1 @@
+done

src/common/blib.c

@@ -751,7 +751,7 @@ void cmd_input(int input) {
         inps = malloc(SB_TEXTLINE_SIZE + 1);
         if (prompt.v.p.ptr) {
           // prime output buffer with prompt text
-          int prompt_len = strlen(prompt.v.p.ptr);
+          int prompt_len = v_strlen(&prompt);
           int len = prompt_len < SB_TEXTLINE_SIZE ? prompt_len : SB_TEXTLINE_SIZE;
           strncpy(inps, prompt.v.p.ptr, len);
           inps[len] = 0;

src/common/units.c

@@ -218,18 +218,15 @@ int close_unit(int uid) {
  * @return 0 on success
  */
 int import_unit(int uid) {
-  char buf[SB_KEYWORD_SIZE + 1];int i;
-
   if (uid >= 0) {
     unit_t *u = &units[uid];
     if (u->status == unit_loaded) {
-      for (i = 0; i < u->hdr.sym_count; i++) {
-        // build the name
-        // with any path component removed from the name
+      for (int i = 0; i < u->hdr.sym_count; i++) {
+        // build the name with any path component removed from the name
+        char buf[SB_KEYWORD_SIZE + SB_KEYWORD_SIZE + 1];
         char *dir_sep = strrchr(u->hdr.base, OS_DIRSEP);
         sprintf(buf, "%s.%s",
-            dir_sep ? dir_sep + 1 : u->hdr.base, u->symbols[i].symbol);
-
+                dir_sep ? dir_sep + 1 : u->hdr.base, u->symbols[i].symbol);
         switch (u->symbols[i].type) {
         case stt_function:
           comp_add_external_func(buf, uid | UID_UNIT_BIT);
@@ -242,12 +239,10 @@ int import_unit(int uid) {
           break;
         };
       }
-    }
-    else {
+    } else {
       return -2;
     }
-  }
-  else {
+  } else {
     return -1;
   }
 

src/common/var.c

@@ -767,15 +767,15 @@ void v_zerostr(var_t *r) {
 void v_input2var(const char *str, var_t *var) {
   v_free(var);
 
-  if (strlen(str) == 0) {
+  if (!str || str[0] == '\0') {
     // no data
     v_setstr(var, str);
   } else {
-    char buf[INT_STR_LEN];
     int type;
     var_int_t lv;
     var_num_t dv;
 
+    char *buf = strdup(str);
     char *sb = strdup(str);
     char *np = get_numexpr(sb, buf, &type, &lv, &dv);
 
@@ -787,6 +787,7 @@ void v_input2var(const char *str, var_t *var) {
       v_setstr(var, str);
     }
     free(sb);
+    free(buf);
   }
 }
 

src/platform/console/Makefile.am

@@ -27,7 +27,7 @@ sbasic_DEPENDENCIES = $(top_srcdir)/src/common/libsb_common.a
 TEST_DIR=../../../samples/distro-examples/tests
 UNIT_TESTS=array break byref eval-test iifs matrices metaa ongoto \
 	         uds hash pass1 call_tau short-circuit strings stack-test \
-           replace-test read-data proc optchk letbug ptr ref \
+           replace-test read-data proc optchk letbug ptr ref input \
            trycatch chain stream-files split-join sprint all scope goto keymap
 
 test: ${bin_PROGRAMS}