idmap2: assign uninitialized variables initial values
In C++, local primitives are not automatically initialized:
void foo() {
int i; // primitive: value is indeterminate
std::string s; // class: calls default ctor
...
}
Create.cpp and Dump.cpp include this type of uninitialized variable; fix
this by explicitly assigning an initial value.
Also add a new script to help catch these types of errors in the future:
valgrind.sh, which will run a few idmap2 commands and the idmap2_tests
through Valgrind.
Also update static-checks.sh to rely on a command's return value instead
of the presence of any output.
Test: frameworks/base/cmds/idmap2/valgrind.sh
Change-Id: Ic9dbd3e9a768beb39ac677ff294b0fca5ee8f9d2
This commit is contained in:
committed by
Todd Kennedy
parent
c087fbc6f4
commit
dd63e5d256
@@ -50,7 +50,7 @@ Result<Unit> Create(const std::vector<std::string>& args) {
|
|||||||
std::string overlay_apk_path;
|
std::string overlay_apk_path;
|
||||||
std::string idmap_path;
|
std::string idmap_path;
|
||||||
std::vector<std::string> policies;
|
std::vector<std::string> policies;
|
||||||
bool ignore_overlayable;
|
bool ignore_overlayable = false;
|
||||||
|
|
||||||
const CommandLineOptions opts =
|
const CommandLineOptions opts =
|
||||||
CommandLineOptions("idmap2 create")
|
CommandLineOptions("idmap2 create")
|
||||||
|
|||||||
@@ -39,7 +39,7 @@ using android::idmap2::Unit;
|
|||||||
Result<Unit> Dump(const std::vector<std::string>& args) {
|
Result<Unit> Dump(const std::vector<std::string>& args) {
|
||||||
SYSTRACE << "Dump " << args;
|
SYSTRACE << "Dump " << args;
|
||||||
std::string idmap_path;
|
std::string idmap_path;
|
||||||
bool verbose;
|
bool verbose = false;
|
||||||
|
|
||||||
const CommandLineOptions opts =
|
const CommandLineOptions opts =
|
||||||
CommandLineOptions("idmap2 dump")
|
CommandLineOptions("idmap2 dump")
|
||||||
|
|||||||
@@ -27,10 +27,11 @@ function _eval()
|
|||||||
local red="\e[31m"
|
local red="\e[31m"
|
||||||
local green="\e[32m"
|
local green="\e[32m"
|
||||||
local reset="\e[0m"
|
local reset="\e[0m"
|
||||||
|
local output
|
||||||
|
|
||||||
_log "${green}[ RUN ]${reset} ${label}"
|
_log "${green}[ RUN ]${reset} ${label}"
|
||||||
local output="$(eval "$cmd")"
|
output="$(eval "$cmd" 2>&1)"
|
||||||
if [[ -z "${output}" ]]; then
|
if [[ $? -eq 0 ]]; then
|
||||||
_log "${green}[ OK ]${reset} ${label}"
|
_log "${green}[ OK ]${reset} ${label}"
|
||||||
return 0
|
return 0
|
||||||
else
|
else
|
||||||
|
|||||||
59
cmds/idmap2/valgrind.sh
Executable file
59
cmds/idmap2/valgrind.sh
Executable file
@@ -0,0 +1,59 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
#
|
||||||
|
# Copyright (C) 2019 The Android Open Source Project
|
||||||
|
#
|
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
# you may not use this file except in compliance with the License.
|
||||||
|
# You may obtain a copy of the License at
|
||||||
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
# See the License for the specific language governing permissions and
|
||||||
|
# limitations under the License.
|
||||||
|
#
|
||||||
|
|
||||||
|
function _log()
|
||||||
|
{
|
||||||
|
echo -e "$*" >&2
|
||||||
|
}
|
||||||
|
|
||||||
|
function _eval()
|
||||||
|
{
|
||||||
|
local label="$1"
|
||||||
|
local cmd="$2"
|
||||||
|
local red="\e[31m"
|
||||||
|
local green="\e[32m"
|
||||||
|
local reset="\e[0m"
|
||||||
|
local output
|
||||||
|
|
||||||
|
_log "${green}[ RUN ]${reset} ${label}"
|
||||||
|
output="$(eval "$cmd" 2>&1)"
|
||||||
|
if [[ $? -eq 0 ]]; then
|
||||||
|
_log "${green}[ OK ]${reset} ${label}"
|
||||||
|
return 0
|
||||||
|
else
|
||||||
|
echo "${output}"
|
||||||
|
_log "${red}[ FAILED ]${reset} ${label}"
|
||||||
|
errors=$((errors + 1))
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
errors=0
|
||||||
|
script="$(readlink -f "$BASH_SOURCE")"
|
||||||
|
prefix="$(dirname "$script")"
|
||||||
|
target_path="${prefix}/tests/data/target/target.apk"
|
||||||
|
overlay_path="${prefix}/tests/data/overlay/overlay.apk"
|
||||||
|
idmap_path="/tmp/a.idmap"
|
||||||
|
valgrind="valgrind --error-exitcode=1 -q --track-origins=yes --leak-check=full"
|
||||||
|
|
||||||
|
_eval "idmap2 create" "$valgrind idmap2 create --policy public --target-apk-path $target_path --overlay-apk-path $overlay_path --idmap-path $idmap_path"
|
||||||
|
_eval "idmap2 dump" "$valgrind idmap2 dump --idmap-path $idmap_path"
|
||||||
|
_eval "idmap2 lookup" "$valgrind idmap2 lookup --idmap-path $idmap_path --config '' --resid test.target:string/str1"
|
||||||
|
_eval "idmap2 scan" "$valgrind idmap2 scan --input-directory ${prefix}/tests/data/overlay --recursive --target-package-name test.target --target-apk-path $target_path --output-directory /tmp --override-policy public"
|
||||||
|
_eval "idmap2 verify" "$valgrind idmap2 verify --idmap-path $idmap_path"
|
||||||
|
_eval "idmap2_tests" "$valgrind $ANDROID_HOST_OUT/nativetest64/idmap2_tests/idmap2_tests"
|
||||||
|
exit $errors
|
||||||
Reference in New Issue
Block a user