Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Fix warnings in sequence wrapper code
Previously, the sequence wrapper had unsigned int / signed int comparisons (due to Qt container classes only allowing signed int indexes (where negative indexes are invalid). This commit ensures that unsigned indexes are bounds checked appropriately, and also fixes a warning due to QString construction from QByteArray. Finally, it updates the documentation for sequences to clarify the indexing semantics. Change-Id: I4c6e133bef6e980a9ccb62ff15a70a5d41537ee3 Reviewed-by: Martin Jones <martin.jones@nokia.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
- Loading branch information
Chris Adams
authored and
Qt by Nokia
committed
Feb 15, 2012
1 parent
03883c2
commit 3c3b995
Showing
5 changed files
with
219 additions
and
37 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
89 changes: 89 additions & 0 deletions
89
tests/auto/declarative/qdeclarativeecmascript/data/sequenceConversion.indexes.qml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,89 @@ | ||
import QtQuick 2.0 | ||
import Qt.test 1.0 | ||
|
||
Item { | ||
id: root | ||
objectName: "root" | ||
|
||
MySequenceConversionObject { | ||
id: msco | ||
objectName: "msco" | ||
} | ||
|
||
property bool success: false | ||
|
||
function verifyExpected(array, idx) { | ||
for (var i = 0; i < idx; ++i) { | ||
if (array[i] != i) { | ||
return false; | ||
} | ||
} | ||
return true; | ||
} | ||
|
||
function indexedAccess() { | ||
success = true; | ||
|
||
msco.intListProperty = [ 0, 1, 2, 3, 4 ]; | ||
var expectedLength = msco.intListProperty.length; | ||
var maxIndex = msco.maxIndex; | ||
var tooBigIndex = msco.tooBigIndex; | ||
var negativeIndex = msco.negativeIndex; | ||
|
||
// shouldn't be able to set the length > maxIndex. | ||
msco.intListProperty.length = tooBigIndex; | ||
if (msco.intListProperty.length != expectedLength) | ||
success = false; | ||
if (!verifyExpected(msco.intListProperty, 4)) | ||
success = false; | ||
|
||
// shouldn't be able to set any index > maxIndex. | ||
msco.intListProperty[tooBigIndex] = 12; | ||
if (msco.intListProperty.length != expectedLength) | ||
success = false; | ||
if (!verifyExpected(msco.intListProperty, 4)) | ||
success = false; | ||
|
||
// shouldn't be able to access any index > maxIndex. | ||
var valueAtTBI = msco.intListProperty[tooBigIndex]; | ||
if (valueAtTBI != undefined) | ||
success = false; | ||
if (!verifyExpected(msco.intListProperty, 4)) | ||
success = false; | ||
|
||
// shouldn't be able to set the length to < 0 | ||
msco.intListProperty.length = negativeIndex; | ||
if (msco.intListProperty.length != expectedLength) | ||
success = false; // shouldn't have changed. | ||
if (!verifyExpected(msco.intListProperty, 4)) | ||
success = false; | ||
|
||
// shouldn't be able to set any index < 0. | ||
msco.intListProperty[negativeIndex] = 12; | ||
if (msco.intListProperty.length != expectedLength) | ||
success = false; | ||
if (!verifyExpected(msco.intListProperty, 4)) | ||
success = false; | ||
|
||
// shouldn't be able to access any index < 0. | ||
var valueAtNI = msco.intListProperty[negativeIndex]; | ||
if (valueAtNI != undefined) | ||
success = false; | ||
if (!verifyExpected(msco.intListProperty, 4)) | ||
success = false; | ||
|
||
// NOTE: while these two operations are technically | ||
// fine, we expect std::bad_alloc exceptions here | ||
// which we handle in the sequence wrapper. | ||
msco.intListProperty.length = maxIndex; | ||
if (msco.intListProperty.length != expectedLength) | ||
success = false; | ||
if (!verifyExpected(msco.intListProperty, 4)) | ||
success = false; | ||
msco.intListProperty[maxIndex] = 15; | ||
if (msco.intListProperty.length != expectedLength) | ||
success = false; | ||
if (!verifyExpected(msco.intListProperty, 4)) | ||
success = false; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters