Fix another memory leak with custom importer

mgreter · mgreter · commit 1f3217924f31 · 2014-12-20T04:32:02.000+01:00
diff --git a/parser.cpp b/parser.cpp
@@ -174,6 +174,7 @@ namespace Sass {
             sass_import_get_path(current),
             cookie);
           if (includes) {
+            struct Sass_Import** list = includes;
             while (*includes) {
               struct Sass_Import* include = *includes;
               const char *file = sass_import_get_path(include);
@@ -192,13 +193,11 @@ namespace Sass {
               }
               ++includes;
             }
-            // go for next parse loop
+            // deallocate returned memory
+            sass_delete_import_list(list);
+            // parse next import
             continue;
           }
-          // deallocate returned memory
-          sass_delete_import_list(includes);
-          // custom importer returned nothing
-          // means we should use default loader
         }
 
         add_single_file(imp, import_path);

Original file line number	Diff line number	Diff line change
`@@ -174,6 +174,7 @@ namespace Sass {`
`174`	`174`	`sass_import_get_path(current),`
`175`	`175`	`cookie);`
`176`	`176`	`if (includes) {`
	`177`	`+ struct Sass_Import** list = includes;`
`177`	`178`	`while (*includes) {`
`178`	`179`	`struct Sass_Import* include = *includes;`
`179`	`180`	`const char *file = sass_import_get_path(include);`
`@@ -192,13 +193,11 @@ namespace Sass {`
`192`	`193`	`}`
`193`	`194`	`++includes;`
`194`	`195`	`}`
`195`		`- // go for next parse loop`
	`196`	`+ // deallocate returned memory`
	`197`	`+ sass_delete_import_list(list);`
	`198`	`+ // parse next import`
`196`	`199`	`continue;`
`197`	`200`	`}`
`198`		`- // deallocate returned memory`
`199`		`- sass_delete_import_list(includes);`
`200`		`- // custom importer returned nothing`
`201`		`- // means we should use default loader`
`202`	`201`	`}`
`203`	`202`
`204`	`203`	`add_single_file(imp, import_path);`