Merge pull request #15 from barkmadley/master

mmottl · mmottl · commit b93d8f4c7e73 · 2016-05-23T23:42:39.000-04:00
Remove use after free error in ref_count_finalize_dbw
diff --git a/lib/sqlite3_stubs.c b/lib/sqlite3_stubs.c
@@ -341,8 +341,10 @@ static inline void ref_count_finalize_dbw(db_wrap *dbw)
 {
   if (--dbw->ref_count == 0) {
     user_function *link;
-    for (link = dbw->user_functions; link != NULL; link = link->next) {
+    user_function *next;
+    for (link = dbw->user_functions; link != NULL; link = next) {
       caml_remove_generational_global_root(&link->v_fun);
+      next = link->next;
       caml_stat_free(link);
     }
     dbw->user_functions = NULL;

Original file line number	Diff line number	Diff line change
`@@ -341,8 +341,10 @@ static inline void ref_count_finalize_dbw(db_wrap *dbw)`
`341`	`341`	`{`
`342`	`342`	`if (--dbw->ref_count == 0) {`
`343`	`343`	`user_function *link;`
`344`		`- for (link = dbw->user_functions; link != NULL; link = link->next) {`
	`344`	`+ user_function *next;`
	`345`	`+ for (link = dbw->user_functions; link != NULL; link = next) {`
`345`	`346`	`caml_remove_generational_global_root(&link->v_fun);`
	`347`	`+ next = link->next;`
`346`	`348`	`caml_stat_free(link);`
`347`	`349`	`}`
`348`	`350`	`dbw->user_functions = NULL;`