COMMON: fix NPE evaluating invalid code

Author: chrisws

src/common/eval.c

@@ -426,38 +426,38 @@ void eval(var_t *r) {
       op = CODE(IP);
       IP++;
 
-      if (r->type == V_INT && left->type == V_INT) {
+      if (r->type == V_INT && v_is_type(left, V_INT)) {
         if (op == '+') {
           r->v.i += left->v.i;
         } else {
           r->v.i = left->v.i - r->v.i;
         }
-      } else if (r->type == V_NUM && left->type == V_NUM) {
+      } else if (r->type == V_NUM && v_is_type(left, V_NUM)) {
         r->type = V_NUM;
         if (op == '+') {
           r->v.n += left->v.n;
         } else {
           r->v.n = left->v.n - r->v.n;
         }
-      } else if (r->type == V_INT && left->type == V_NUM) {
+      } else if (r->type == V_INT && v_is_type(left, V_NUM)) {
         r->type = V_NUM;
         if (op == '+') {
           r->v.n = r->v.i + left->v.n;
         } else {
           r->v.n = left->v.n - r->v.i;
         }
-      } else if (r->type == V_NUM && left->type == V_INT) {
+      } else if (r->type == V_NUM && v_is_type(left, V_INT)) {
         if (op == '+') {
           r->v.n += left->v.i;
         } else {
           r->v.n = left->v.i - r->v.n;
         }
       } else {
-        if (r->type == V_ARRAY || left->type == V_ARRAY) {
+        if (r->type == V_ARRAY || v_is_type(left, V_ARRAY)) {
           // 
           // ARRAYS
           // 
-          if (r->type == V_ARRAY && left->type == V_ARRAY) {
+          if (r->type == V_ARRAY && v_is_type(left, V_ARRAY)) {
             if (op == '+') {
               mat_add(r, left);
             } else {
@@ -499,11 +499,11 @@ void eval(var_t *r) {
       op = CODE(IP);
       IP++;
 
-      if (r->type == V_ARRAY || left->type == V_ARRAY) {
+      if (r->type == V_ARRAY || v_is_type(left, V_ARRAY)) {
         // 
         // ARRAYS
         // 
-        if (r->type == V_ARRAY && left->type == V_ARRAY) {
+        if (r->type == V_ARRAY && v_is_type(left, V_ARRAY)) {
           if (op == '*') {
             mat_mul(left, r);
           } else {
@@ -769,13 +769,13 @@ void eval(var_t *r) {
             }
           }
         } else if (r->type == V_STR) {
-          if (left->type == V_STR) {
+          if (v_is_type(left, V_STR)) {
             if (left->v.p.ptr[0] != '\0') {
               ri = (strstr(r->v.p.ptr, left->v.p.ptr) != NULL);
             } else {
               ri = 0;
             }
-          } else if (left->type == V_NUM || left->type == V_INT) {
+          } else if (v_is_type(left, V_NUM) || v_is_type(left, V_INT)) {
             var_t *v;
 
             v = v_clone(left);

src/common/extlib.c

@@ -277,7 +277,7 @@ int slib_llopen(slib_t * lib) {
   return (lib->handle != NULL);
 #elif defined(__CYGWIN__)
   char win32Path[1024];
-  cygwin_conv_to_full_win32_path(lib->fullname, win32Path);
+  cygwin_conv_path(CCP_POSIX_TO_WIN_A, lib->fullname, win32Path, sizeof(win32Path));
   lib->handle = LoadLibrary(win32Path);
   if (lib->handle == NULL)
   panic("SB-LibMgr: error on loading %s\n", win32Path);

src/common/inet.h

@@ -14,13 +14,9 @@
 #include <config.h>
 #endif
 
-#if defined(_Win32)
-#include <winsock.h>
-#else
 #include <string.h>
 #include <errno.h>
 #include <sys/types.h>
-#endif
 
 typedef int socket_t;
 

src/common/var.c

@@ -925,3 +925,10 @@ void v_input2var(const char *str, var_t *var) {
     tmp_free(sb);
   }
 }
+
+/*
+ * null safe variable type check
+ */
+int v_is_type(var_t *v, int type) { 
+  return (v != NULL && v->type == type);
+}

src/common/var.h

@@ -708,6 +708,16 @@ void v_input2var(const char *str, var_t *var);
  */
 char *v_getstr(var_t *v);
 
+/**
+ * @ingroup var
+ *
+ * returns whether the variable is of the given type
+ *
+ * @param v is the variable
+ * @return whether the variable is of the given type
+ */
+int v_is_type(var_t *v, int type);
+
 /*
  * low-level byte-code parsing
  *