github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: correctly emplace optional values in the value converter (#21008)

Browse Source 
* fix: correctly emplace optional values in the value converter

* chore: replace optional with nullopt when the conversion failed
This commit is contained in:
trop[bot]
2019-11-06 13:32:38 -08:00
committed by Shelley Vohr
parent d63150502b
commit 2e8349c520
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
shell/common/native_mate_converters/value_converter.h
View File

@@ -41,10 +41,12 @@ struct Converter<base::Optional<T>> {
v8::Local<v8::Value> val,
base::Optional<T>* out) {
if (val->IsNull() || val->IsUndefined()) {
*out = base::nullopt;
return true;
}
T converted;
if (Converter<T>::FromV8(isolate, val, &converted)) {
if (!Converter<T>::FromV8(isolate, val, &converted)) {
*out = base::nullopt;
return true;
}
out->emplace(converted);