Fix nif to avoid segfault on upgrade

AntonSizov · AntonSizov · commit 2fa7e0476eb0 · 2013-08-13T19:06:55.000+03:00
diff --git a/c_src/jsonx.c b/c_src/jsonx.c
@@ -62,10 +62,12 @@ reload(ErlNifEnv* env, void** priv_data, ERL_NIF_TERM load_info){
 
 static int
 upgrade(ErlNifEnv* env, void** priv_data, void** old_priv_data, ERL_NIF_TERM load_info){
+  *priv_data = *old_priv_data;
   return 0;
 }
 static void
 unload(ErlNifEnv* env, void* priv_data){
+  enif_free(priv_data);
   return;
 }
 
diff --git a/src/jsonx.erl b/src/jsonx.erl
@@ -231,7 +231,7 @@ init() ->
         Dir ->
             filename:join(Dir, ?LIBNAME)
     end,
-    erlang:load_nif(So, [[json, struct, proplist, eep18, no_match], [true, false, null],
+	ok = erlang:load_nif(So, [[json, struct, proplist, eep18, no_match], [true, false, null],
 			 [error, big_num, invalid_string, invalid_json, trailing_data, undefined_record]]).
 
 not_loaded(Line) ->

Original file line number	Diff line number	Diff line change
`@@ -62,10 +62,12 @@ reload(ErlNifEnv* env, void** priv_data, ERL_NIF_TERM load_info){`
`62`	`62`
`63`	`63`	`static int`
`64`	`64`	`upgrade(ErlNifEnv* env, void priv_data, void old_priv_data, ERL_NIF_TERM load_info){`
	`65`	`+ priv_data = old_priv_data;`
`65`	`66`	`return 0;`
`66`	`67`	`}`
`67`	`68`	`static void`
`68`	`69`	`unload(ErlNifEnv* env, void* priv_data){`
	`70`	`+ enif_free(priv_data);`
`69`	`71`	`return;`
`70`	`72`	`}`
`71`	`73`