From 785136fd3697c0b236d58b3d12fee429cb81ea1a Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Mon, 19 Mar 2018 11:46:59 +0100
Subject: [PATCH] GLESv2Imp: fix bad return statement android-emugl: add
 formatting strings to fprintf output, fixing possible security issue

---
 .../libs/Translator/GLES_V2/.GLESv2Imp.cpp.swp  | Bin 16384 -> 0 bytes
 .../host/libs/Translator/GLES_V2/GLESv2Imp.cpp  |   2 ++
 .../android-emugl/host/tools/emugen/ApiGen.cpp  |   3 +--
 .../host/tools/emugen/EntryPoint.cpp            |   2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)
 delete mode 100644 external/android-emugl/host/libs/Translator/GLES_V2/.GLESv2Imp.cpp.swp

diff --git a/external/android-emugl/host/libs/Translator/GLES_V2/.GLESv2Imp.cpp.swp b/external/android-emugl/host/libs/Translator/GLES_V2/.GLESv2Imp.cpp.swp
deleted file mode 100644
index 8102470c466227658d4ea2ddf8c32b58a732f10d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16384
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
LI<D5c8!+%6TWJym

diff --git a/external/android-emugl/host/libs/Translator/GLES_V2/GLESv2Imp.cpp b/external/android-emugl/host/libs/Translator/GLES_V2/GLESv2Imp.cpp
index c49d4b7..91ff0b1 100644
--- a/external/android-emugl/host/libs/Translator/GLES_V2/GLESv2Imp.cpp
+++ b/external/android-emugl/host/libs/Translator/GLES_V2/GLESv2Imp.cpp
@@ -1048,8 +1048,10 @@ GL_APICALL void  GL_APIENTRY glGetIntegerv(GLenum pname, GLint* params){
     if (ctx->glGetIntegerv(pname,params))
     {
         if (destroyCtx)
+        {
             deleteGLESContext(ctx);
             return;
+        }
     }
   
     bool es2 = ctx->getCaps()->GL_ARB_ES2_COMPATIBILITY;
diff --git a/external/android-emugl/host/tools/emugen/ApiGen.cpp b/external/android-emugl/host/tools/emugen/ApiGen.cpp
index fc6c031..f912cb5 100644
--- a/external/android-emugl/host/tools/emugen/ApiGen.cpp
+++ b/external/android-emugl/host/tools/emugen/ApiGen.cpp
@@ -1158,8 +1158,7 @@ int ApiGen::genDecoderImpl(const std::string &filename)
                         varoffset.c_str(),
                         varoffset.c_str(),
                         varoffset.c_str(),
-                        classname.c_str(),
-                        e->name().c_str()
+                        classname.c_str()
                         );
 
                 varoffset += " + 4";
diff --git a/external/android-emugl/host/tools/emugen/EntryPoint.cpp b/external/android-emugl/host/tools/emugen/EntryPoint.cpp
index cc3bef1..8f91c83 100644
--- a/external/android-emugl/host/tools/emugen/EntryPoint.cpp
+++ b/external/android-emugl/host/tools/emugen/EntryPoint.cpp
@@ -99,7 +99,7 @@ bool EntryPoint::parse(unsigned int lc, const std::string & str)
         std::string vartype, varname;
         if (!parseParameterDeclaration(field, &vartype, &varname, &error)) {
             fprintf(stderr,
-                    "line: %d: Parsing error in field <%s>\n",
+                    "line: %d: Parsing error in field <%s>, error: %s\n",
                     lc,
                     field.c_str(),
                     error.c_str());