Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
e641469f
Commit
e641469f
authored
Jul 28, 2016
by
Jacek Caban
Committed by
Alexandre Julliard
Jul 29, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
jscript: Set output to undefined in jsval_copy on failure.
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
9fc2863e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
5 deletions
+7
-5
dispex.c
dlls/jscript/dispex.c
+1
-3
jsutils.c
dlls/jscript/jsutils.c
+6
-2
No files found.
dlls/jscript/dispex.c
View file @
e641469f
...
...
@@ -491,10 +491,8 @@ static HRESULT prop_put(jsdisp_t *This, dispex_prop_t *prop, jsval_t val, IServi
TRACE
(
"%s = %s
\n
"
,
debugstr_w
(
prop
->
name
),
debugstr_jsval
(
val
));
hres
=
jsval_copy
(
val
,
&
prop
->
u
.
val
);
if
(
FAILED
(
hres
))
{
prop
->
u
.
val
=
jsval_undefined
();
if
(
FAILED
(
hres
))
return
hres
;
}
if
(
This
->
builtin_info
->
on_put
)
This
->
builtin_info
->
on_put
(
This
,
prop
->
name
);
...
...
dlls/jscript/jsutils.c
View file @
e641469f
...
...
@@ -212,13 +212,17 @@ static HRESULT jsval_variant(jsval_t *val, VARIANT *var)
__JSVAL_TYPE
(
*
val
)
=
JSV_VARIANT
;
__JSVAL_VAR
(
*
val
)
=
v
=
heap_alloc
(
sizeof
(
VARIANT
));
if
(
!
v
)
if
(
!
v
)
{
*
val
=
jsval_undefined
();
return
E_OUTOFMEMORY
;
}
V_VT
(
v
)
=
VT_EMPTY
;
hres
=
VariantCopy
(
v
,
var
);
if
(
FAILED
(
hres
))
if
(
FAILED
(
hres
))
{
*
val
=
jsval_undefined
();
heap_free
(
v
);
}
return
hres
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment