jyapayne/anbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #646 from LocutusOfBorg/fix-security-buffer-overflows

Browse source 
Fix security buffer overflows
This commit is contained in:
Simon Fels 2018-05-14 16:10:59 +02:00 • committed by GitHub
commit 77f3badb97
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -5,8 +5,8 @@ include(CTest)
include(GNUInstallDirs) include(GNUInstallDirs)
if (NOT CMAKE_BUILD_TYPE) if (NOT CMAKE_BUILD_TYPE)
message(STATUS "No build type selected, default to release") message(STATUS "No build type selected, default to RelWithDebInfo")
set(CMAKE_BUILD_TYPE "release") set(CMAKE_BUILD_TYPE "RelWithDebInfo")
endif() endif()
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)

2
debian/compat vendored
View file

@ -1 +1 @@
7 9

4
debian/control vendored
View file

@ -2,8 +2,8 @@ Source: anbox
Section: misc Section: misc
Priority: optional Priority: optional
Maintainer: Simon Fels <morphis@gravedo.de> Maintainer: Simon Fels <morphis@gravedo.de>
Build-Depends: debhelper (>= 7), dkms, dh-systemd Build-Depends: debhelper (>= 9), dkms, dh-systemd
Standards-Version: 3.9.7 Standards-Version: 4.1.3
Homepage: http://anbox.io Homepage: http://anbox.io
Vcs-Browser: https://github.com/anbox/anbox Vcs-Browser: https://github.com/anbox/anbox
Vcs-Git: https://github.com/anbox/anbox.git Vcs-Git: https://github.com/anbox/anbox.git

BIN
external/android-emugl/host/libs/Translator/GLES_V2/.GLESv2Imp.cpp.swp vendored
View file

Binary file not shown.

2
external/android-emugl/host/libs/Translator/GLES_V2/GLESv2Imp.cpp vendored
View file

@ -1048,8 +1048,10 @@ GL_APICALL void GL_APIENTRY glGetIntegerv(GLenum pname, GLint* params){
if (ctx->glGetIntegerv(pname,params)) if (ctx->glGetIntegerv(pname,params))
{ {
if (destroyCtx) if (destroyCtx)
{
deleteGLESContext(ctx); deleteGLESContext(ctx);
return; return;
}
} }
bool es2 = ctx->getCaps()->GL_ARB_ES2_COMPATIBILITY; bool es2 = ctx->getCaps()->GL_ARB_ES2_COMPATIBILITY;

3
external/android-emugl/host/tools/emugen/ApiGen.cpp vendored
View file

@ -1158,8 +1158,7 @@ int ApiGen::genDecoderImpl(const std::string &filename)
varoffset.c_str(), varoffset.c_str(),
varoffset.c_str(), varoffset.c_str(),
varoffset.c_str(), varoffset.c_str(),
classname.c_str(), classname.c_str()
e->name().c_str()
); );
varoffset += " + 4"; varoffset += " + 4";

2
external/android-emugl/host/tools/emugen/EntryPoint.cpp vendored
View file

@ -99,7 +99,7 @@ bool EntryPoint::parse(unsigned int lc, const std::string & str)
std::string vartype, varname; std::string vartype, varname;
if (!parseParameterDeclaration(field, &vartype, &varname, &error)) { if (!parseParameterDeclaration(field, &vartype, &varname, &error)) {
fprintf(stderr, fprintf(stderr,
"line: %d: Parsing error in field <%s>\n", "line: %d: Parsing error in field <%s>, error: %s\n",
lc, lc,
field.c_str(), field.c_str(),
error.c_str()); error.c_str());

4
scripts/clean-build.sh
View file

@ -56,8 +56,8 @@ cleanup
mkdir build || rm -rf build/* mkdir build || rm -rf build/*
cd build cd build
cmake .. cmake ..
make -j10 VERBOSE=1 make -j10
make test VERBOSE=1 make test
cd .. cd ..
cleanup cleanup