src: guard against nullptr deref in TimerWrapHandle::Stop

addaleax · addaleax · commit feb93c4e8425 · 2020-07-21T21:11:16.000+02:00
Refs: #34454 PR-URL: #34460 Reviewed-By: Jiawen Geng <technicalcute@gmail.com> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: David Carlier <devnexen@gmail.com>
diff --git a/src/timer_wrap.cc b/src/timer_wrap.cc
@@ -56,7 +56,8 @@ TimerWrapHandle::TimerWrapHandle(
 }
 
 void TimerWrapHandle::Stop() {
-  return timer_->Stop();
+  if (timer_ != nullptr)
+    return timer_->Stop();
 }
 
 void TimerWrapHandle::Close() {

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,8 @@ TimerWrapHandle::TimerWrapHandle(`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`void TimerWrapHandle::Stop() {`
`59`		`- return timer_->Stop();`
	`59`	`+ if (timer_ != nullptr)`
	`60`	`+ return timer_->Stop();`
`60`	`61`	`}`
`61`	`62`
`62`	`63`	`void TimerWrapHandle::Close() {`