Fix valgrind errors in strings in compiled data
authorSimon Hausmann <simon.hausmann@digia.com>
Thu, 15 Aug 2013 11:57:06 +0000 (13:57 +0200)
committerLars Knoll <lars.knoll@digia.com>
Thu, 15 Aug 2013 13:28:42 +0000 (15:28 +0200)
Make sure to include the zero terminator in the QString data.

Change-Id: Ie3c3b6a135b012a12a1d4de8bfb16cb8cf7d4615
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
src/qml/compiler/qv4compiler.cpp

index 135c867..6707283 100644 (file)
@@ -146,7 +146,7 @@ QV4::CompiledData::Unit *QV4::Compiler::JSUnitGenerator::generateUnit()
         s->str.alloc = 0;
         s->str.capacityReserved = false;
         s->str.offset = sizeof(QArrayData);
-        memcpy(s + 1, qstr.constData(), qstr.length()*sizeof(ushort));
+        memcpy(s + 1, qstr.constData(), (qstr.length() + 1)*sizeof(ushort));
 
         string += QV4::CompiledData::String::calculateSize(qstr);
     }