Fix memory leak with custom importer not being freed

sass · Dec 19, 2014 · 1b72808 · 1b72808
1 parent 763717a
commit 1b72808
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/sass_context.cpp b/sass_context.cpp
@@ -549,9 +549,12 @@ extern "C" {
         cur = next;
       }
     }
+    // Free custom importer
+    free(options->importer);
     // Free the list container
     free(options->c_functions);
     // Make it null terminated
+    options->importer = 0;
     options->c_functions = 0;
     options->include_paths = 0;
   }

diff --git a/sass_functions.cpp b/sass_functions.cpp
@@ -66,6 +66,12 @@ extern "C" {
   Sass_C_Import_Fn sass_import_get_function(Sass_C_Import_Callback fn) { return fn->function; }
   void* sass_import_get_cookie(Sass_C_Import_Callback fn) { return fn->cookie; }
 
+  // Just in case we have some stray import structs
+  void sass_delete_importer (Sass_C_Import_Callback fn)
+  {
+    free(fn);
+  }
+
   // Creator for sass custom importer return argument list
   struct Sass_Import** sass_make_import_list(size_t length)
   {

diff --git a/sass_functions.h b/sass_functions.h
@@ -28,6 +28,8 @@ Sass_C_Import_Callback sass_make_importer (Sass_C_Import_Fn, void* cookie);
 Sass_C_Import_Fn sass_import_get_function (Sass_C_Import_Callback fn);
 void* sass_import_get_cookie (Sass_C_Import_Callback fn);
 
+// Deallocator for associated memory
+void sass_delete_importer (Sass_C_Import_Callback fn);
 
 // Creator for sass custom importer return argument list
 struct Sass_Import** sass_make_import_list (size_t length);