diff options
| author | Sverker Eriksson <[email protected]> | 2014-02-05 19:41:28 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2014-02-05 19:41:28 +0100 |
| commit | 4082c3d1ad3d0e8bb85706c5f3b2bde97bb43fcb (patch) | |
| tree | 4f70a7a70457aacaf96b7e1a7399945a67d27ba5 /erts/emulator/test/nif_SUITE_data/nif_SUITE.c | |
| parent | ab20369b433a8e6440e5e71a1c92bf7440916192 (diff) | |
| download | otp-4082c3d1ad3d0e8bb85706c5f3b2bde97bb43fcb.tar.gz otp-4082c3d1ad3d0e8bb85706c5f3b2bde97bb43fcb.tar.bz2 otp-4082c3d1ad3d0e8bb85706c5f3b2bde97bb43fcb.zip | |
erts: Fix NIF bug when load/upgrade fails after enif_open_resource_type
..has been successfully called.
Opened resource types (created or taken-over) were left "hanging"
leading both to memory leakage and other more strange and serious behavior.
Now a proper rollback is done.
Diffstat (limited to 'erts/emulator/test/nif_SUITE_data/nif_SUITE.c')
| -rw-r--r-- | erts/emulator/test/nif_SUITE_data/nif_SUITE.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/erts/emulator/test/nif_SUITE_data/nif_SUITE.c b/erts/emulator/test/nif_SUITE_data/nif_SUITE.c index 0c4a9f7e5c..cdc64b89b2 100644 --- a/erts/emulator/test/nif_SUITE_data/nif_SUITE.c +++ b/erts/emulator/test/nif_SUITE_data/nif_SUITE.c @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 2009-2013. All Rights Reserved. + * Copyright Ericsson AB 2009-2014. All Rights Reserved. * * The contents of this file are subject to the Erlang Public License, * Version 1.1, (the "License"); you may not use this file except in @@ -1477,7 +1477,6 @@ static ERL_NIF_TERM consume_timeslice_nif(ErlNifEnv* env, int argc, const ERL_NI { int percent; char atom[10]; - int do_repeat; if (!enif_get_int(env, argv[0], &percent) || !enif_get_atom(env, argv[1], atom, sizeof(atom), ERL_NIF_LATIN1)) { |