From 400f22d2ed7fbb771ff8bc8281227894e4416952 Mon Sep 17 00:00:00 2001
From: Dmitry Volyntsev <xeioex@nginx.com>
Date: Wed, 16 Dec 2020 20:27:43 +0000
Subject: [PATCH] Avoiding modification of vm->retval in njs_add_event().

---
 src/njs_event.c | 2 --
 src/njs_timer.c | 6 +++++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/njs_event.c b/src/njs_event.c
index 011a666d..56c831fc 100644
--- a/src/njs_event.c
+++ b/src/njs_event.c
@@ -62,8 +62,6 @@ njs_add_event(njs_vm_t *vm, njs_event_t *event)
         return NJS_ERROR;
     }
 
-    njs_set_number(&vm->retval, vm->event_id - 1);
-
     return NJS_OK;
 }
 
diff --git a/src/njs_timer.c b/src/njs_timer.c
index 6c21ce05..d0356d21 100644
--- a/src/njs_timer.c
+++ b/src/njs_timer.c
@@ -68,7 +68,11 @@ njs_set_timer(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
         return NJS_ERROR;
     }
 
-    return njs_add_event(vm, event);
+    if (njs_add_event(vm, event) == NJS_OK) {
+        njs_set_number(&vm->retval, vm->event_id - 1);
+    }
+
+    return NJS_OK;
 
 memory_error:
 
-- 
2.47.3