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

diff --git a/src/njs_event.c b/src/njs_event.c
index 011a666db3ca8ba385404388c5defb17ee97e491..56c831fcf3cda0d0d7a023e3ddbdd9d013ec2cc0 100644 (file)
--- 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 6c21ce0578a4a6718cdbf981b9df30e3305f6d40..d0356d210cb5af2a844cc7eaa1fe6f0603c938dc 100644 (file)
--- 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: