cosmos 4.4.0-java → 4.5.1-java

data/ext/cosmos/ext/platform/platform.c

@@ -23,31 +23,64 @@ VALUE cSegFault = Qnil;
   #include <signal.h>
   #include <unistd.h>
   #include <time.h>
+  #include <string.h>
+  #include <sys/stat.h>
 
   static void catch_sigsegv(int sig_num) {
+    const int FILENAME_LEN = 256;
     char *cosmos_log_dir = NULL;
     time_t rawtime;
-    struct tm *timeinfo;
-    char filename[256];
+    struct tm timeinfo;
+    struct tm *timeinfo_ptr;
+    struct stat stats;
+    char filename[FILENAME_LEN];
     FILE* file = NULL;
 
     signal(SIGSEGV, SIG_DFL);
     signal(SIGILL, SIG_DFL);
 
     cosmos_log_dir = getenv("COSMOS_LOGS_DIR");
-    if (cosmos_log_dir == NULL) {
-      cosmos_log_dir = (char*) ".";
+    // If the COSMOS_LOGS_DIR env var isn't set or if it's too big set to "."
+    // NOTE: The filename buffer will be written to by snprintf which appends
+    // a null terminator so we have 1 less byte available minus the length
+    // of the fixed filename structure
+    if ((cosmos_log_dir == NULL) || (strlen(cosmos_log_dir) > (FILENAME_LEN - 1 - strlen("/YYYY_MM_DD_HH_MM_SS_segfault.txt"))))
+    {
+      cosmos_log_dir = (char*)".";
     }
+    // Validate that we can write to this directory
+    if (stat(cosmos_log_dir, &stats) == 0)
+    {
+      if (!((stats.st_mode & W_OK)&& S_ISDIR(stats.st_mode)))
+      {
+        cosmos_log_dir = (char *)".";
+      }
+    }
+    else
+    {
+      cosmos_log_dir = (char *)".";
+    }
+
     time(&rawtime);
-    timeinfo = localtime(&rawtime);
-    sprintf(filename, "%s/%04u_%02u_%02u_%02u_%02u_%02u_segfault.txt",
-      cosmos_log_dir,
-      1900 + timeinfo->tm_year,
-      1 + timeinfo->tm_mon,
-      timeinfo->tm_mday,
-      timeinfo->tm_hour,
-      timeinfo->tm_min,
-      timeinfo->tm_sec);
+    timeinfo_ptr = localtime_r(&rawtime, &timeinfo);
+    if (timeinfo_ptr == NULL)
+    {
+      // If localtime returns NULL we set our own and set to 1919 to make it interesting
+      strptime("1919-01-01 00:00:00", "%Y-%m-%d %H:%M:%S", &timeinfo);
+    }
+    snprintf(filename, FILENAME_LEN, "%s/%04u_%02u_%02u_%02u_%02u_%02u_segfault.txt",
+            cosmos_log_dir,
+            1900 + timeinfo.tm_year,
+            1 + timeinfo.tm_mon,
+            timeinfo.tm_mday,
+            timeinfo.tm_hour,
+            timeinfo.tm_min,
+            timeinfo.tm_sec);
+
+    // Fortify warns about Path Manipulation here. We explictly allow this to let
+    // segfault files be written to a directory of their choosing.
+    // The input is validated above for length and to ensure it is a writable directory.
+    // If the checks fail the directory is set to the current directory without additional info.
     file = freopen(filename, "a", stderr);
     /* Using file removes a warning */
     if (file) {
@@ -58,11 +91,12 @@ VALUE cSegFault = Qnil;
   }
 #endif
 
-static VALUE segfault(VALUE self) {
-  char *a = 0;
-  *a = 50;
-  return Qnil;
-}
+/* NOTE: Uncomment and rebuilt for testing the handler */
+// static VALUE segfault(VALUE self) {
+//   char *a = 0;
+//   *a = 50;
+//   return Qnil;
+// }
 
 /*
  * Initialize methods for Platform specific C code
@@ -95,7 +129,8 @@ void Init_platform (void) {
   signal(SIGILL, catch_sigsegv);
 #endif
 
-  mCosmos = rb_define_module("Cosmos");
-  cSegFault = rb_define_class_under(mCosmos, "SegFault", rb_cObject);
-  rb_define_singleton_method(cSegFault, "segfault", segfault, 0);
+  /* NOTE: Uncomment and rebuilt for testing the handler */
+  // mCosmos = rb_define_module("Cosmos");
+  // cSegFault = rb_define_class_under(mCosmos, "SegFault", rb_cObject);
+  // rb_define_singleton_method(cSegFault, "segfault", segfault, 0);
 }

data/ext/cosmos/ext/polynomial_conversion/polynomial_conversion.c

@@ -30,20 +30,16 @@ static ID id_method_to_f = 0;
  */
 static VALUE polynomial_conversion_call(VALUE self, VALUE value, VALUE myself, VALUE buffer)
 {
-  volatile VALUE coeffs = Qnil;
-  long coeffs_length = 0;
   int index = 0;
-  double double_value = 0.0;
-  double coeff = 0.0;
   double converted = 0.0;
   double raised_to_power = 1.0;
 
-  coeffs = rb_ivar_get(self, id_ivar_coeffs);
-  coeffs_length = RARRAY_LEN(coeffs);
-  double_value = RFLOAT_VALUE(rb_funcall(value, id_method_to_f, 0));
+  volatile VALUE coeffs = rb_ivar_get(self, id_ivar_coeffs);
+  long coeffs_length = RARRAY_LEN(coeffs);
+  double double_value = RFLOAT_VALUE(rb_funcall(value, id_method_to_f, 0));
 
   /* Handle C0 */
-  coeff = RFLOAT_VALUE(rb_ary_entry(coeffs, 0));
+  double coeff = RFLOAT_VALUE(rb_ary_entry(coeffs, 0));
   converted += coeff;
 
   /* Handle Coefficients raised to a power */

data/ext/cosmos/ext/structure/structure.c

@@ -493,6 +493,9 @@ static VALUE binary_accessor_read(VALUE self, VALUE param_bit_offset, VALUE para
     if (BYTE_ALIGNED(bit_offset)) {
       string_length = upper_bound - lower_bound + 1;
       string = malloc(string_length + 1);
+      if (string == NULL) {
+        rb_raise(rb_eNoMemError, "malloc of %d returned NULL", string_length + 1);
+      }
       memcpy(string, buffer + lower_bound, string_length);
       string[string_length] = 0;
       if (param_data_type == symbol_STRING) {
@@ -538,6 +541,9 @@ static VALUE binary_accessor_read(VALUE self, VALUE param_bit_offset, VALUE para
       string_length = ((bit_size - 1)/ 8) + 1;
       array_length = string_length + 4; /* Required number of bytes plus slack */
       unsigned_char_array = (unsigned char*) malloc(array_length);
+      if (unsigned_char_array == NULL) {
+        rb_raise(rb_eNoMemError, "malloc of %d returned NULL", array_length);
+      }
       read_bitfield(lower_bound, upper_bound, bit_offset, bit_size, given_bit_offset, given_bit_size, param_endianness, buffer, (int)buffer_length, unsigned_char_array);
 
       num_words = ((string_length - 1) / 4) + 1;
@@ -629,6 +635,9 @@ static VALUE binary_accessor_read(VALUE self, VALUE param_bit_offset, VALUE para
       string_length = ((bit_size - 1)/ 8) + 1;
       array_length = string_length + 4; /* Required number of bytes plus slack */
       unsigned_char_array = (unsigned char*) malloc(array_length);
+      if (unsigned_char_array == NULL) {
+        rb_raise(rb_eNoMemError, "malloc of %d returned NULL", array_length);
+      }
       read_bitfield(lower_bound, upper_bound, bit_offset, bit_size, given_bit_offset, given_bit_size, param_endianness, buffer, (int)buffer_length, unsigned_char_array);
 
       num_words = ((string_length - 1) / 4) + 1;
@@ -1001,6 +1010,9 @@ static VALUE binary_accessor_write(VALUE self, VALUE value, VALUE param_bit_offs
       string_length = ((bit_size - 1)/ 8) + 1;
       array_length = string_length + 4; /* Required number of bytes plus slack */
       unsigned_char_array = (unsigned char*) malloc(array_length);
+      if (unsigned_char_array == NULL) {
+        rb_raise(rb_eNoMemError, "malloc of %d returned NULL", array_length);
+      }
 
       num_words = ((string_length - 1) / 4) + 1;
       num_bytes = num_words * 4;

data/extensions/vscode/.gitignore

@@ -0,0 +1,4 @@
+out
+node_modules
+client/server
+*.vsix

data/extensions/vscode/.vscode/launch.json

@@ -0,0 +1,32 @@
+{
+	"version": "0.0.2",
+	// List of configurations. Add new configurations or edit existing ones.
+	"configurations": [
+		{
+			"name": "Launch Client",
+			"type": "extensionHost",
+			"request": "launch",
+			"runtimeExecutable": "${execPath}",
+			"args": [
+				"--extensionDevelopmentPath=${workspaceRoot}/client"
+			],
+			"stopOnEntry": false,
+			"sourceMaps": true,
+			"outFiles": [
+				"${workspaceRoot}/client/out/**/*.js"
+			],
+			"preLaunchTask": "watch:client"
+		},
+		{
+			"name": "Attach to Server",
+			"type": "node",
+			"request": "attach",
+			"port": 6009,
+			"sourceMaps": true,
+			"outFiles": [
+				"${workspaceRoot}/client/server/**/*.js"
+			],
+			"preLaunchTask": "watch:server"
+		}
+	]
+}

data/extensions/vscode/.vscode/settings.json

@@ -0,0 +1,13 @@
+{
+	// PowerShell
+	"terminal.integrated.shell.windows": "C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe",
+	"files.exclude": {
+		"out": false // set this to true to hide the "out" folder with the compiled JS files
+	},
+	"search.exclude": {
+		"out": true // set this to false to include "out" folder in search results
+	},
+	"typescript.tsdk": "./node_modules/typescript/lib",
+	"typescript.tsc.autoDetect": "off",
+	"npm.enableScriptExplorer": true
+}

data/extensions/vscode/.vscode/tasks.json

@@ -0,0 +1,79 @@
+{
+	"version": "2.0.0",
+	"tasks": [
+		{
+			"label": "compile",
+			"dependsOn": [
+				"compile:client",
+				"compile:server"
+			],
+			"problemMatcher": []
+		},
+		{
+			"label": "compile:client",
+			"type": "npm",
+			"script": "compile:client",
+			"group": "build",
+			"presentation": {
+				"panel": "dedicated",
+				"reveal": "never"
+			},
+			"problemMatcher": [
+				"$tsc"
+			]
+		},
+		{
+			"label": "compile:server",
+			"type": "npm",
+			"script": "compile:server",
+			"group": "build",
+			"presentation": {
+				"panel": "dedicated",
+				"reveal": "never"
+			},
+			"problemMatcher": [
+				"$tsc"
+			]
+		},
+		{
+			"label": "watch",
+			"dependsOn": [
+				"watch:client",
+				"watch:server"
+			],
+			"group": {
+				"kind": "build",
+				"isDefault": true
+			},
+			"problemMatcher": []
+		},
+		{
+			"label": "watch:client",
+			"type": "npm",
+			"script": "watch:client",
+			"isBackground": true,
+			"group": "build",
+			"presentation": {
+				"panel": "dedicated",
+				"reveal": "never"
+			},
+			"problemMatcher": [
+				"$tsc-watch"
+			]
+		},
+		{
+			"label": "watch:server",
+			"type": "npm",
+			"script": "watch:server",
+			"isBackground": true,
+			"group": "build",
+			"presentation": {
+				"panel": "dedicated",
+				"reveal": "never"
+			},
+			"problemMatcher": [
+				"$tsc-watch"
+			]
+		}
+	]
+}