Fixing GC-related issue

Author: yard

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sassc (0.1.3)
+    sassc (0.1.5)
       ffi
       rake-compiler
 

ext/libsass

@@ -10,6 +10,7 @@ class Context < FFI::Struct
     #   char* output_string;
     #   char* source_map_string;
     #   const char* source_map_file;
+    #   bool omit_source_map_url;
     #   struct sass_options options;
     #   int error_status;
     #   char* error_message;
@@ -19,33 +20,20 @@ class Context < FFI::Struct
     #   int num_included_files;
     # };
 
-
-
-    # struct sass_context {
-    #   const char* source_string;
-    #   char* output_string;
-    #   struct sass_options options;
-    #   int error_status;
-    #   char* error_message;
-    #   struct Sass_C_Function_Data* c_functions;
-    #   int num_c_functions;
-    #   char** included_files;
-    #   int num_included_files;
-    # };
-
-    layout :input_path,         :pointer,
-           :output_path,        :pointer,
-           :source_string,      :pointer,
-           :output_string,      :pointer,
-           :source_map_string,  :pointer,
-           :source_map_file,    :pointer,
-           :options,            SassOptions,
-           :error_status,       :int32,
-           :error_message,      :pointer,
-           :c_functions,        :pointer,
-           :num_c_functions,    :int32,
-           :included_files,     :pointer,
-           :num_included_files, :int32
+    layout :input_path,          :pointer,
+           :output_path,         :pointer,
+           :source_string,       :pointer,
+           :output_string,       :pointer,
+           :source_map_string,   :pointer,
+           :source_map_file,     :pointer,
+           :omit_source_map_url, :bool,
+           :options,             SassOptions,
+           :error_status,        :int32,
+           :error_message,       :pointer,
+           :c_functions,         :pointer,
+           :num_c_functions,     :int32,
+           :included_files,      :pointer,
+           :num_included_files,  :int32
 
 
     #  Creates SASSC context using the input string and options provided.
@@ -68,20 +56,27 @@ def self.create(input_string, sass_options = {})
     #  The functions are supposed to be Ruby blocks, received 1 argument and returning 1 result.
     #
     def set_custom_functions(input_funcs)
-      funcs_ptr = FFI::MemoryPointer.new(SassC::Lib::SassCFunctionDescriptor, input_funcs.count + 1)
+      @funcs_ptr = FFI::MemoryPointer.new(SassC::Lib::SassCFunctionDescriptor, input_funcs.count)
+      @gc_staph = []
 
       input_funcs.each.with_index do |(signature, block), i|
-        fn = SassC::Lib::SassCFunctionDescriptor.new(funcs_ptr + i * SassC::Lib::SassCFunctionDescriptor.size)
+        fn = SassC::Lib::SassCFunctionDescriptor.new(@funcs_ptr + i * SassC::Lib::SassCFunctionDescriptor.size)
 
-        fn[:signature] = FFI::MemoryPointer.from_string(signature)
-        fn[:function] = FFI::Function.new(SassC::Lib::SassValue.by_value, [SassC::Lib::SassValue.by_value, :pointer]) do |arg, cookie|
+        str = FFI::MemoryPointer.from_string(signature)
+        fn[:signature] = str
+        
+        func = FFI::Function.new(SassC::Lib::SassValue.by_value, [SassC::Lib::SassValue.by_value, :pointer]) do |arg, cookie|
           ruby_arg    = arg.to_ruby 
           ruby_result = block.call(ruby_arg)
           SassC::Lib::SassValue.new.from_ruby(ruby_result) 
         end
+        fn[:function] = func
+
+        @gc_staph << func
+        @gc_staph << str
       end
 
-      self[:c_functions]      = funcs_ptr
+      self[:c_functions]      = @funcs_ptr
       self[:num_c_functions]  = input_funcs.size 
     end
 

lib/sassc/lib/context.rb

@@ -4,6 +4,7 @@ class SassCFunctionDescriptor < FFI::Struct
     # struct Sass_C_Function_Descriptor {
     #   const char*     signature;
     #   Sass_C_Function function;
+    #   void *cookie;
     # };
 
     layout :signature,  :pointer,