Merge pull request #144 from tsdgeos/v1

Make sure context.file is not null before calling strlen.
go-qml · Feb 9, 2015 · 2ee7e5f · 2ee7e5f
2 parents 1116cb9 + 154c0d1
commit 2ee7e5f
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/cpp/capi.cpp b/cpp/capi.cpp
@@ -847,7 +847,8 @@ QQmlListProperty_ *newListProperty(GoAddr *addr, intptr_t reflectIndex, intptr_t
 void internalLogHandler(QtMsgType severity, const QMessageLogContext &context, const QString &text)
 {
     QByteArray textba = text.toUtf8();
-    LogMessage message = {severity, textba.constData(), textba.size(), context.file, (int)strlen(context.file), context.line};
+    const int fileLength = context.file ? strlen(context.file) : 0;
+    LogMessage message = {severity, textba.constData(), textba.size(), context.file, fileLength, context.line};
     hookLogHandler(&message);
 }