From d97dc2c64be5530b22c8e4f9e11d246285ea8a17 Mon Sep 17 00:00:00 2001
From: Rickard Green <rickard@erlang.org>
Date: Thu, 31 Mar 2016 16:06:10 +0200
Subject: Fix bad refc management of process struct

---
 erts/emulator/beam/erl_process.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'erts/emulator')

diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c
index b4b97d7df1..2b468a9ad9 100644
--- a/erts/emulator/beam/erl_process.c
+++ b/erts/emulator/beam/erl_process.c
@@ -9293,17 +9293,18 @@ Process *schedule(Process *p, int calls)
 				      | ERTS_PSFLG_PENDING_EXIT
 				      | ERTS_PSFLG_ACTIVE_SYS))
 			    == ERTS_PSFLG_SUSPENDED)) {
-			if (state & ERTS_PSFLG_FREE) {
+			if (proxy_p) {
+			    free_proxy_proc(proxy_p);
+			    proxy_p = NULL;
+			}
+			else if (state & ERTS_PSFLG_FREE) {
+			    /* free and not queued by proxy */
 #ifdef ERTS_SMP
 			    erts_smp_proc_dec_refc(p);
 #else
 			    erts_free_proc(p);
 #endif
 			}
-			if (proxy_p) {
-			    free_proxy_proc(proxy_p);
-			    proxy_p = NULL;
-			}
 			goto pick_next_process;
 		    }
 		    state = new;
-- 
cgit v1.2.3