Merge pull request #15968 from annabrewer/android-crash-fix

BUGZ-996: Android app crashes on startup
This commit is contained in:
Shannon Romano 2019-07-24 09:33:50 -07:00 committed by GitHub
commit a8842bf521
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -107,7 +107,8 @@ void Instance::enumerateNics() {
json Instance::getCPU(int index) {
assert(index <(int) _cpus.size());
if (index >= (int)_cpus.size())
if (index < 0 || (int) _cpus.size() <= index)
return json();
return _cpus.at(index);
@ -116,7 +117,7 @@ json Instance::getCPU(int index) {
json Instance::getGPU(int index) {
assert(index <(int) _gpus.size());
if (index >=(int) _gpus.size())
if (index < 0 || (int) _gpus.size() <= index)
return json();
return _gpus.at(index);
@ -126,7 +127,7 @@ json Instance::getGPU(int index) {
json Instance::getDisplay(int index) {
assert(index <(int) _displays.size());
if (index >=(int) _displays.size())
if (index < 0 || (int) _displays.size() <= index)
return json();
return _displays.at(index);