Workaround crash in reportAdditionalMemoryCost other platforms

Anthony J. Thibault committed 7 years ago

Commit e1534b31 parent 154fd392 files · +6 −1Browse files

Showing the changes to libraries/script-engine/src/ArrayBufferClass.cpp (1 of 2 files). Show all

Unified · Split

libraries/script-engine/src/ArrayBufferClass.cpp+3−1

@@ -76,8 +76,10 @@ QScriptValue ArrayBufferClass::newInstance(qint32 size) { · 75 unmodified lines
76	engine()->evaluate("throw \"ArgumentError: absurd length\"");	76	engine()->evaluate("throw \"ArgumentError: absurd length\"");
77	return QScriptValue();	77	return QScriptValue();
78	}	78	}
79		79	// We've patched qt to fix https://highfidelity.atlassian.net/browse/BUGZ-46 on mac and windows only.
		80	#if defined(Q_OS_WIN) \|\| defined(Q_OS_MAC)
80	engine()->reportAdditionalMemoryCost(size);	81	engine()->reportAdditionalMemoryCost(size);
		82	#endif
81	QScriptEngine* eng = engine();	83	QScriptEngine* eng = engine();
82	QVariant variant = QVariant::fromValue(QByteArray(size, 0));	84	QVariant variant = QVariant::fromValue(QByteArray(size, 0));
83	QScriptValue data = eng->newVariant(variant);	85	QScriptValue data = eng->newVariant(variant);