feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Android: Be more careful in androidVirtualDevices()

Browse Source 
The backtrace in QTCREATORBUG-13081 suggest that something with
dev.serialNumber is wrong. The input (attached to the bug report) does
not indicate why we would misparse it. So add checking code
to all places where we index into line.

Change-Id: Ic8e4afb763dc1c899e9a1d0503d6494e2aea1223
Reviewed-by: BogDan Vatra <bogdan@kde.org>
This commit is contained in:
Daniel Teske
2014-09-24 12:22:14 +02:00
parent ba793f02a6
commit f0bfff8183
1 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/plugins/android/androidconfigurations.cpp
View File

@@ -610,33 +610,50 @@ QVector<AndroidDeviceInfo> AndroidConfig::androidVirtualDevices() const
AndroidDeviceInfo dev; AndroidDeviceInfo dev;
for (int i = 0; i < avds.size(); i++) { for (int i = 0; i < avds.size(); i++) {
QString line = QLatin1String(avds[i]); QString line = QLatin1String(avds.at(i));
if (!line.contains(QLatin1String("Name:"))) if (!line.contains(QLatin1String("Name:")))
continue; continue;
dev.serialNumber = line.mid(line.indexOf(QLatin1Char(':')) + 2).trimmed(); int index = line.indexOf(QLatin1Char(':')) + 2;
if (index >= line.size())
break;
dev.serialNumber = line.mid(index).trimmed();
dev.sdk = -1;
dev.cpuAbi.clear();
++i; ++i;
for (; i < avds.size(); ++i) { for (; i < avds.size(); ++i) {
line = QLatin1String(avds[i]); line = QLatin1String(avds[i]);
if (line.contains(QLatin1String("---------"))) if (line.contains(QLatin1String("---------")))
break; break;
if (line.contains(QLatin1String("Target:"))) { if (line.contains(QLatin1String("Target:"))) {
QString tmp = line.mid(line.lastIndexOf(QLatin1Char(' '))).remove(QLatin1Char(')')).trimmed(); int lastIndex = line.lastIndexOf(QLatin1Char(' '));
if (lastIndex == -1) // skip line
break;
QString tmp = line.mid(lastIndex).remove(QLatin1Char(')')).trimmed();
if (tmp == QLatin1String("L")) // HACK for android-L preview if (tmp == QLatin1String("L")) // HACK for android-L preview
dev.sdk = 20; dev.sdk = 20;
else else
dev.sdk = tmp.toInt(); dev.sdk = tmp.toInt();
} }
if (line.contains(QLatin1String("Tag/ABI:"))) if (line.contains(QLatin1String("Tag/ABI:"))) {
dev.cpuAbi = QStringList() << line.mid(line.lastIndexOf(QLatin1Char('/')) +1); int lastIndex = line.lastIndexOf(QLatin1Char('/')) + 1;
else if (line.contains(QLatin1String("ABI:"))) if (lastIndex >= line.size())
dev.cpuAbi = QStringList() << line.mid(line.lastIndexOf(QLatin1Char(' '))).trimmed(); break;
dev.cpuAbi = QStringList() << line.mid(lastIndex);
} else if (line.contains(QLatin1String("ABI:"))) {
int lastIndex = line.lastIndexOf(QLatin1Char(' ')) + 1;
if (lastIndex >= line.size())
break;
dev.cpuAbi = QStringList() << line.mid(lastIndex).trimmed();
}
} }
// armeabi-v7a devices can also run armeabi code // armeabi-v7a devices can also run armeabi code
if (dev.cpuAbi == QStringList(QLatin1String("armeabi-v7a"))) if (dev.cpuAbi == QStringList(QLatin1String("armeabi-v7a")))
dev.cpuAbi << QLatin1String("armeabi"); dev.cpuAbi << QLatin1String("armeabi");
dev.state = AndroidDeviceInfo::OkState; dev.state = AndroidDeviceInfo::OkState;
dev.type = AndroidDeviceInfo::Emulator; dev.type = AndroidDeviceInfo::Emulator;
if (dev.cpuAbi.isEmpty() || dev.sdk == -1)
continue;
devices.push_back(dev); devices.push_back(dev);
} }
Utils::sort(devices, androidDevicesLessThan); Utils::sort(devices, androidDevicesLessThan);