Hash :
55df82e0
Author :
Date :
2023-05-04T15:23:08
Fix crash in std::stoi() std::stoi() will throw exceptions when the input is invalid, so change to use std::atoi() which doesn't throw exception. Bug: chromium:1401610 Change-Id: I188412363b26286003b5daf311e5725fe4c4d7e9 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4507533 Commit-Queue: Peng Huang <penghuang@chromium.org> Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org> Auto-Submit: Peng Huang <penghuang@chromium.org>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61
//
// Copyright 2018 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
// SystemInfo_android.cpp: implementation of the Android-specific parts of SystemInfo.h
#include "gpu_info_util/SystemInfo_internal.h"
#include <sys/system_properties.h>
#include <cstdlib>
#include <cstring>
#include <fstream>
#include <string>
#include "common/angleutils.h"
#include "common/debug.h"
namespace angle
{
namespace
{
bool GetAndroidSystemProperty(const std::string &propertyName, std::string *value)
{
// PROP_VALUE_MAX from <sys/system_properties.h>
std::vector<char> propertyBuf(PROP_VALUE_MAX);
int len = __system_property_get(propertyName.c_str(), propertyBuf.data());
if (len <= 0)
{
return false;
}
*value = std::string(propertyBuf.data());
return true;
}
} // namespace
bool GetSystemInfo(SystemInfo *info)
{
bool isFullyPopulated = true;
isFullyPopulated =
GetAndroidSystemProperty("ro.product.manufacturer", &info->machineManufacturer) &&
isFullyPopulated;
isFullyPopulated =
GetAndroidSystemProperty("ro.product.model", &info->machineModelName) && isFullyPopulated;
std::string androidSdkLevel;
if (GetAndroidSystemProperty("ro.build.version.sdk", &androidSdkLevel))
{
info->androidSdkLevel = std::atoi(androidSdkLevel.c_str());
}
else
{
isFullyPopulated = false;
}
return GetSystemInfoVulkan(info) && isFullyPopulated;
}
} // namespace angle