From 6b1f74260acd8b0a05e22b376c6854e82d079040 Mon Sep 17 00:00:00 2001 From: "vogelheim@chromium.org" Date: Fri, 9 May 2014 12:07:38 +0000 Subject: [PATCH] Prevent calls to ReturnValue::Set with pointer-valued types. Currently, this code will compile: SomePointer* p = ...; ReturnValue r = ...; r.Set(p); What happens is that ReturnValue::Set has no pointer-ish overloads, but a bool one, and hence C++ will convert the pointer to a bool and use the Set(bool) overload. In other words, the example above is equivalent to: r.Set(p ? true : false); Which probably isn't what the author had in mind. This change adds a Set(void*) overload whose body forces a compile error, to prevent this from happening inadvertently. The only use of this indeed turned out to be an error. (Wait for issue 364025 before submitting.) BUG= R=dcarney@chromium.org Review URL: https://codereview.chromium.org/240013004 git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@21217 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- include/v8.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/v8.h b/include/v8.h index af8f991..45d2fb6 100644 --- a/include/v8.h +++ b/include/v8.h @@ -2429,6 +2429,9 @@ class ReturnValue { // Convenience getter for Isolate V8_INLINE Isolate* GetIsolate(); + // Pointer setter: Uncompilable to prevent inadvertent misuse. + void Set(void* whatever); + private: template friend class ReturnValue; template friend class FunctionCallbackInfo; @@ -5974,6 +5977,12 @@ Isolate* ReturnValue::GetIsolate() { } template +void ReturnValue::Set(void* whatever) { + // Uncompilable to prevent inadvertent misuse. + TYPE_CHECK(void*, Primitive); +} + +template internal::Object* ReturnValue::GetDefaultValue() { // Default value is always the pointer below value_ on the stack. return value_[-1]; -- 2.7.4