diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-09-16 13:41:30 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-09-16 14:44:47 +0200 |
commit | 67ed2317b0b9d45eb5d0faf822411f4760d3638d (patch) | |
tree | 12e64dffbf8dbd84f34d627f68c01a3ae9a37f32 | |
parent | 7844437aefea34920f3a70d840c779377e65612b (diff) |
shiboken6: Fix some code related to removed arguments
Remove an unused variable and fix an overflow.
Task-number: PYSIDE-1660
Change-Id: I951da3c647f45bda0e905f5621f3a53843487567
Reviewed-by: Christian Tismer <tismer@stackless.com>
-rw-r--r-- | sources/shiboken6/generator/shiboken/overloaddata.cpp | 3 | ||||
-rw-r--r-- | sources/shiboken6/generator/shiboken/shibokengenerator.cpp | 7 |
2 files changed, 2 insertions, 8 deletions
diff --git a/sources/shiboken6/generator/shiboken/overloaddata.cpp b/sources/shiboken6/generator/shiboken/overloaddata.cpp index f315c9d3f..5ad2087d3 100644 --- a/sources/shiboken6/generator/shiboken/overloaddata.cpp +++ b/sources/shiboken6/generator/shiboken/overloaddata.cpp @@ -752,7 +752,8 @@ int OverloadData::numberOfRemovedArguments(const AbstractMetaFunctionCPtr &func, { Q_ASSERT(finalArgPos >= 0); int removed = 0; - for (int i = 0; i < finalArgPos + removed; ++i) { + const int size = func->arguments().size(); + for (int i = 0; i < qMin(size, finalArgPos + removed); ++i) { if (func->argumentRemoved(i + 1)) ++removed; } diff --git a/sources/shiboken6/generator/shiboken/shibokengenerator.cpp b/sources/shiboken6/generator/shiboken/shibokengenerator.cpp index 822c4d2fb..faeb860f6 100644 --- a/sources/shiboken6/generator/shiboken/shibokengenerator.cpp +++ b/sources/shiboken6/generator/shiboken/shibokengenerator.cpp @@ -1650,13 +1650,6 @@ void ShibokenGenerator::writeCodeSnips(TextStream &s, if (code.isEmpty()) return; - // Calculate the real number of arguments. - int argsRemoved = 0; - for (int i = 0; i < func->arguments().size(); i++) { - if (func->argumentRemoved(i+1)) - argsRemoved++; - } - // Replace %PYARG_# variables. replacePyArg0(language, &code); |