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

GLESv2Imp: fix bad return statement

Browse source 
android-emugl: add formatting strings to fprintf output, fixing possible security issue
This commit is contained in:
Gianfranco Costamagna 2018-03-19 11:46:59 +01:00
commit 785136fd36
4 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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());