cosmos 4.5.0-java → 4.5.1-java

data/ext/cosmos/ext/line_graph/line_graph.c

@@ -95,8 +95,6 @@ static VALUE line_clip_internal(double x0, double y0, double x1, double y1, doub
   volatile VALUE done = Qfalse;
   volatile VALUE clipped0 = Qfalse;
   volatile VALUE clipped1 = Qfalse;
-  double x = 0.0;
-  double y = 0.0;
 
   code0 = cal_code(x0, y0, xmin, ymin, xmax, ymax);
   code1 = cal_code(x1, y1, xmin, ymin, xmax, ymax);
@@ -117,8 +115,8 @@ static VALUE line_clip_internal(double x0, double y0, double x1, double y1, doub
     } else {
       /* Part of the line is inside the viewable area.  Figure out which part
        * of the line can be drawn. */
-      x = 0.0;
-      y = 0.0;
+      double x;
+      double y;
 
       if (code0 != 0) {
         codeout = code0;
@@ -178,28 +176,19 @@ static VALUE line_clip(VALUE self, VALUE x0, VALUE y0, VALUE x1, VALUE y1, VALUE
   volatile VALUE result_clipped0 = Qnil;
   volatile VALUE result_clipped1 = Qnil;
   volatile VALUE return_value = Qnil;
-  double double_x0 = 0.0;
-  double double_y0 = 0.0;
-  double double_x1 = 0.0;
-  double double_y1 = 0.0;
-  double double_xmin = 0.0;
-  double double_ymin = 0.0;
-  double double_xmax = 0.0;
-  double double_ymax = 0.0;
+  double double_x0 = RFLOAT_VALUE(rb_funcall(x0, id_method_to_f, 0));
+  double double_y0 = RFLOAT_VALUE(rb_funcall(y0, id_method_to_f, 0));
+  double double_x1 = RFLOAT_VALUE(rb_funcall(x1, id_method_to_f, 0));
+  double double_y1 = RFLOAT_VALUE(rb_funcall(y1, id_method_to_f, 0));
+  double double_xmin = RFLOAT_VALUE(rb_funcall(xmin, id_method_to_f, 0));
+  double double_ymin = RFLOAT_VALUE(rb_funcall(ymin, id_method_to_f, 0));
+  double double_xmax = RFLOAT_VALUE(rb_funcall(xmax, id_method_to_f, 0));
+  double double_ymax = RFLOAT_VALUE(rb_funcall(ymax, id_method_to_f, 0));
   double result_x0 = 0.0;
   double result_y0 = 0.0;
   double result_x1 = 0.0;
   double result_y1 = 0.0;
 
-  double_x0 = RFLOAT_VALUE(rb_funcall(x0, id_method_to_f, 0));
-  double_y0 = RFLOAT_VALUE(rb_funcall(y0, id_method_to_f, 0));
-  double_x1 = RFLOAT_VALUE(rb_funcall(x1, id_method_to_f, 0));
-  double_y1 = RFLOAT_VALUE(rb_funcall(y1, id_method_to_f, 0));
-  double_xmin = RFLOAT_VALUE(rb_funcall(xmin, id_method_to_f, 0));
-  double_ymin = RFLOAT_VALUE(rb_funcall(ymin, id_method_to_f, 0));
-  double_xmax = RFLOAT_VALUE(rb_funcall(xmax, id_method_to_f, 0));
-  double_ymax = RFLOAT_VALUE(rb_funcall(ymax, id_method_to_f, 0));
-
   result = line_clip_internal(double_x0, double_y0, double_x1, double_y1, double_xmin, double_ymin, double_xmax, double_ymax, &result_x0, &result_y0, &result_x1, &result_y1, &result_clipped0, &result_clipped1);
 
   if (result == Qtrue)
@@ -236,10 +225,8 @@ static long scale_value_to_graph_y_internal (double y, double y_max, double y_sc
 static VALUE scale_value_to_graph_y(int argc, VALUE* argv, VALUE self) {
   volatile VALUE y = Qnil;
   ID id_axis = 0;
-  long long_graph_top_y = 0;
-  double double_y = 0.0;
-  double double_y_max = 0.0;
-  double double_y_scale = 0.0;
+  double double_y_max;
+  double double_y_scale;
 
   switch (argc) {
     case 1:
@@ -256,8 +243,8 @@ static VALUE scale_value_to_graph_y(int argc, VALUE* argv, VALUE self) {
       break;
   };
 
-  long_graph_top_y = FIX2INT(rb_ivar_get(self, id_ivar_graph_top_y));
-  double_y = RFLOAT_VALUE(rb_funcall(y, id_method_to_f, 0));
+  long long_graph_top_y = FIX2INT(rb_ivar_get(self, id_ivar_graph_top_y));
+  double double_y = RFLOAT_VALUE(rb_funcall(y, id_method_to_f, 0));
 
   if (id_axis == id_LEFT) {
     double_y_max = RFLOAT_VALUE(rb_funcall(rb_ivar_get(self, id_ivar_left_y_max),   id_method_to_f, 0));
@@ -281,15 +268,10 @@ static long scale_value_to_graph_x_internal (double x, double x_min, double x_sc
  * This function converts an x value to an x coordinate on the graph
  */
 static VALUE scale_value_to_graph_x(VALUE self, VALUE x) {
-  long long_graph_left_x = 0;
-  double double_x = 0.0;
-  double double_x_min = 0.0;
-  double double_x_scale = 0.0;
-
-  long_graph_left_x = FIX2INT(rb_ivar_get(self, id_ivar_graph_left_x));
-  double_x = RFLOAT_VALUE(rb_funcall(x, id_method_to_f, 0));
-  double_x_min = RFLOAT_VALUE(rb_funcall(rb_ivar_get(self, id_ivar_x_min), id_method_to_f, 0));
-  double_x_scale = RFLOAT_VALUE(rb_funcall(rb_ivar_get(self, id_ivar_x_scale), id_method_to_f, 0));
+  long long_graph_left_x = FIX2INT(rb_ivar_get(self, id_ivar_graph_left_x));
+  double double_x = RFLOAT_VALUE(rb_funcall(x, id_method_to_f, 0));
+  double double_x_min = RFLOAT_VALUE(rb_funcall(rb_ivar_get(self, id_ivar_x_min), id_method_to_f, 0));
+  double double_x_scale = RFLOAT_VALUE(rb_funcall(rb_ivar_get(self, id_ivar_x_scale), id_method_to_f, 0));
 
   return INT2FIX(scale_value_to_graph_x_internal(double_x, double_x_min, double_x_scale, long_graph_left_x));
 }
@@ -301,10 +283,6 @@ static void draw_line_internal(VALUE dc, double x1, double y1, double x2, double
   volatile VALUE result = Qnil;
   volatile VALUE clipped1 = Qnil;
   volatile VALUE clipped2 = Qnil;
-  long x1_scaled = 0;
-  long y1_scaled = 0;
-  long x2_scaled = 0;
-  long y2_scaled = 0;
   double clipped_x1 = 0.0;
   double clipped_y1 = 0.0;
   double clipped_x2 = 0.0;
@@ -315,10 +293,10 @@ static void draw_line_internal(VALUE dc, double x1, double y1, double x2, double
 
   if (result == Qtrue) /* Line is visible so draw it */ {
     /* Scale to graph coordinates */
-    x1_scaled = scale_value_to_graph_x_internal(clipped_x1, x_min, x_scale, graph_left_x);
-    y1_scaled = scale_value_to_graph_y_internal(clipped_y1, y_max, y_scale, graph_top_y);
-    x2_scaled = scale_value_to_graph_x_internal(clipped_x2, x_min, x_scale, graph_left_x);
-    y2_scaled = scale_value_to_graph_y_internal(clipped_y2, y_max, y_scale, graph_top_y);
+    double x1_scaled = scale_value_to_graph_x_internal(clipped_x1, x_min, x_scale, graph_left_x);
+    double y1_scaled = scale_value_to_graph_y_internal(clipped_y1, y_max, y_scale, graph_top_y);
+    double x2_scaled = scale_value_to_graph_x_internal(clipped_x2, x_min, x_scale, graph_left_x);
+    double y2_scaled = scale_value_to_graph_y_internal(clipped_y2, y_max, y_scale, graph_top_y);
 
     /* Draw the line */
     if (RTEST(show_line)) {
@@ -339,30 +317,20 @@ static void draw_line_internal(VALUE dc, double x1, double y1, double x2, double
  * Draws a line between two points that is clipped to fit the visible graph if necessary
  */
 static VALUE draw_line(VALUE self, VALUE dc, VALUE x1, VALUE y1, VALUE x2, VALUE y2, VALUE show_line, VALUE point_size, VALUE axis, VALUE color) {
-  long long_graph_left_x = 0;
-  long long_graph_top_y = 0;
-  ID id_axis = 0;
-  double double_x1 = 0.0;
-  double double_y1 = 0.0;
-  double double_x2 = 0.0;
-  double double_y2 = 0.0;
-  double double_x_min = 0.0;
-  double double_y_min = 0.0;
-  double double_x_max = 0.0;
-  double double_y_max = 0.0;
-  double double_x_scale = 0.0;
-  double double_y_scale = 0.0;
-
-  id_axis = SYM2ID(axis);
-  double_x_max = RFLOAT_VALUE(rb_funcall(rb_ivar_get(self, id_ivar_x_max), id_method_to_f, 0));
-  double_x_min = RFLOAT_VALUE(rb_funcall(rb_ivar_get(self, id_ivar_x_min), id_method_to_f, 0));
-  double_x1 = RFLOAT_VALUE(rb_funcall(x1, id_method_to_f, 0));
-  double_y1 = RFLOAT_VALUE(rb_funcall(y1, id_method_to_f, 0));
-  double_x2 = RFLOAT_VALUE(rb_funcall(x2, id_method_to_f, 0));
-  double_y2 = RFLOAT_VALUE(rb_funcall(y2, id_method_to_f, 0));
-  double_x_scale = RFLOAT_VALUE(rb_funcall(rb_ivar_get(self, id_ivar_x_scale), id_method_to_f, 0));
-  long_graph_left_x = FIX2INT(rb_ivar_get(self, id_ivar_graph_left_x));
-  long_graph_top_y = FIX2INT(rb_ivar_get(self, id_ivar_graph_top_y));
+  double double_y_min;
+  double double_y_max;
+  double double_y_scale;
+
+  ID id_axis = SYM2ID(axis);
+  double double_x_max = RFLOAT_VALUE(rb_funcall(rb_ivar_get(self, id_ivar_x_max), id_method_to_f, 0));
+  double double_x_min = RFLOAT_VALUE(rb_funcall(rb_ivar_get(self, id_ivar_x_min), id_method_to_f, 0));
+  double double_x1 = RFLOAT_VALUE(rb_funcall(x1, id_method_to_f, 0));
+  double double_y1 = RFLOAT_VALUE(rb_funcall(y1, id_method_to_f, 0));
+  double double_x2 = RFLOAT_VALUE(rb_funcall(x2, id_method_to_f, 0));
+  double double_y2 = RFLOAT_VALUE(rb_funcall(y2, id_method_to_f, 0));
+  double double_x_scale = RFLOAT_VALUE(rb_funcall(rb_ivar_get(self, id_ivar_x_scale), id_method_to_f, 0));
+  long long_graph_left_x = FIX2INT(rb_ivar_get(self, id_ivar_graph_left_x));
+  long long_graph_top_y = FIX2INT(rb_ivar_get(self, id_ivar_graph_top_y));
 
   if (id_axis == id_LEFT) {
     double_y_max = RFLOAT_VALUE(rb_funcall(rb_ivar_get(self, id_ivar_left_y_max), id_method_to_f, 0));
@@ -383,37 +351,28 @@ static VALUE draw_line(VALUE self, VALUE dc, VALUE x1, VALUE y1, VALUE x2, VALUE
  * Draws all lines for the given axis
  */
 static VALUE draw_lines (VALUE self, VALUE dc, VALUE axis) {
-  long long_graph_left_x = 0;
-  long long_graph_top_y = 0;
-  long num_lines = 0;
   long line_index = 0;
   long line_length = 0;
   long point_index = 0;
-  ID id_axis = 0;
   volatile VALUE lines = Qnil;
   volatile VALUE line = Qnil;
   volatile VALUE x_values = Qnil;
   volatile VALUE y_values = Qnil;
   volatile VALUE color = Qnil;
-  volatile VALUE show_lines = Qnil;
-  volatile VALUE point_size = Qnil;
-  double double_x1 = 0.0;
-  double double_y1 = 0.0;
-  double double_x2 = 0.0;
-  double double_y2 = 0.0;
-  double double_x_min = 0.0;
-  double double_y_min = 0.0;
-  double double_x_max = 0.0;
-  double double_y_max = 0.0;
-  double double_x_scale = 0.0;
-  double double_y_scale = 0.0;
-
-  id_axis = SYM2ID(axis);
-  double_x_max = RFLOAT_VALUE(rb_funcall(rb_ivar_get(self, id_ivar_x_max), id_method_to_f, 0));
-  double_x_min = RFLOAT_VALUE(rb_funcall(rb_ivar_get(self, id_ivar_x_min), id_method_to_f, 0));
-  double_x_scale = RFLOAT_VALUE(rb_funcall(rb_ivar_get(self, id_ivar_x_scale), id_method_to_f, 0));
-  long_graph_left_x = FIX2INT(rb_ivar_get(self, id_ivar_graph_left_x));
-  long_graph_top_y = FIX2INT(rb_ivar_get(self, id_ivar_graph_top_y));
+  double double_x1;
+  double double_y1;
+  double double_x2;
+  double double_y2;
+  double double_y_min;
+  double double_y_max;
+  double double_y_scale;
+
+  ID id_axis = SYM2ID(axis);
+  double double_x_max = RFLOAT_VALUE(rb_funcall(rb_ivar_get(self, id_ivar_x_max), id_method_to_f, 0));
+  double double_x_min = RFLOAT_VALUE(rb_funcall(rb_ivar_get(self, id_ivar_x_min), id_method_to_f, 0));
+  double double_x_scale = RFLOAT_VALUE(rb_funcall(rb_ivar_get(self, id_ivar_x_scale), id_method_to_f, 0));
+  long long_graph_left_x = FIX2INT(rb_ivar_get(self, id_ivar_graph_left_x));
+  long long_graph_top_y = FIX2INT(rb_ivar_get(self, id_ivar_graph_top_y));
 
   if (id_axis == id_LEFT) {
     lines = rb_funcall(rb_ivar_get(self, id_ivar_lines), id_method_left, 0);
@@ -427,10 +386,10 @@ static VALUE draw_lines (VALUE self, VALUE dc, VALUE axis) {
     double_y_scale = RFLOAT_VALUE(rb_funcall(rb_ivar_get(self, id_ivar_right_y_scale), id_method_to_f, 0));
   }
 
-  show_lines = rb_ivar_get(self, id_ivar_show_lines);
-  point_size = rb_ivar_get(self, id_ivar_point_size);
+  volatile VALUE show_lines = rb_ivar_get(self, id_ivar_show_lines);
+  volatile VALUE point_size = rb_ivar_get(self, id_ivar_point_size);
 
-  num_lines = RARRAY_LEN(lines);
+  long num_lines = RARRAY_LEN(lines);
   for (line_index = 0; line_index < num_lines; line_index++) {
     line = rb_ary_entry(lines, line_index);
     x_values = rb_ary_entry(line, 0);

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/install/Rakefile

@@ -39,14 +39,14 @@ def create_crc_file(official)
   crc = Cosmos::Crc32.new(Cosmos::Crc32::DEFAULT_POLY, Cosmos::Crc32::DEFAULT_SEED, true, false)
   File.open("config/data/crc.txt",'w') do |file|
     file.puts "USER_MODIFIED" unless official
-    Dir[File.join('lib','**','*')].each do |filename|
+    Dir[File.join('lib','**','*')].sort.each do |filename|
       next if File.directory?(filename)
       next if ignore.include?(filename)
       file_data = File.open(filename, 'rb').read.gsub("\x0D\x0A", "\x0A")
       file.puts "\"#{filename}\" #{sprintf("0x%08X", crc.calc(file_data))}"
       count += 1
     end
-    Dir[File.join('config','**','*')].each do |filename|
+    Dir[File.join('config','**','*')].sort.each do |filename|
       next if File.directory?(filename)
       next if ignore.include?(filename)
       next if File.basename(filename) == 'crc.txt'
@@ -54,14 +54,14 @@ def create_crc_file(official)
       file.puts "\"#{filename}\" #{sprintf("0x%08X", crc.calc(file_data))}"
       count += 1
     end
-    Dir[File.join('tools','**','*')].each do |filename|
+    Dir[File.join('tools','**','*')].sort.each do |filename|
       next if File.directory?(filename)
       next if ignore.include?(filename)
       file_data = File.open(filename, 'rb').read.gsub("\x0D\x0A", "\x0A")
       file.puts "\"#{filename}\" #{sprintf("0x%08X", crc.calc(file_data))}"
       count += 1
     end
-    Dir[File.join('procedures','**','*')].each do |filename|
+    Dir[File.join('procedures','**','*')].sort.each do |filename|
       next if File.directory?(filename)
       next if ignore.include?(filename)
       file_data = File.open(filename, 'rb').read.gsub("\x0D\x0A", "\x0A")