diff options
Diffstat (limited to 'src/qml/jsruntime/qv4stackframe_p.h')
| -rw-r--r-- | src/qml/jsruntime/qv4stackframe_p.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4stackframe_p.h b/src/qml/jsruntime/qv4stackframe_p.h index 616fa9a5a9..9b6b5322bd 100644 --- a/src/qml/jsruntime/qv4stackframe_p.h +++ b/src/qml/jsruntime/qv4stackframe_p.h @@ -134,7 +134,9 @@ struct Q_QML_EXPORT CppStackFrame { argc = nFormals; jsFrame->setArgc(argc); - memcpy(jsFrame->args, originalArguments, argc*sizeof(Value)); + // memcpy requires non-null ptr, even if argc*sizeof(Value) == 0 + if (originalArguments) + memcpy(jsFrame->args, originalArguments, argc*sizeof(Value)); Q_STATIC_ASSERT(Encode::undefined() == 0); memset(jsFrame->args + argc, 0, (nRegisters - argc)*sizeof(Value)); |