From: Dmitry Volyntsev <xeioex@nginx.com>
Date: Wed, 16 Dec 2020 20:27:43 +0000 (+0000)
Subject: Avoiding modification of vm->retval in njs_add_event().
X-Git-Tag: 0.5.1~21
X-Git-Url: http://git.kaiwu.me/postgresql/log/contrib/postgres_fdw/static/gitweb.js?a=commitdiff_plain;h=400f22d2ed7fbb771ff8bc8281227894e4416952;p=njs.git

Avoiding modification of vm->retval in njs_add_event().
---

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: