From e647f3c76c5d401d5b1cc0d8a08b314bf467113d Mon Sep 17 00:00:00 2001 From: Jeff Boody Date: Thu, 27 Jan 2011 18:12:09 -0700 Subject: [PATCH] add OES postfix without truncating function Change-Id: Id47304cf38914190cec58d703801f456ab916f63 --- opengl/libs/EGL/Loader.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/opengl/libs/EGL/Loader.cpp b/opengl/libs/EGL/Loader.cpp index 2502f159d..75dec4a8b 100644 --- a/opengl/libs/EGL/Loader.cpp +++ b/opengl/libs/EGL/Loader.cpp @@ -200,11 +200,13 @@ void Loader::init_api(void* dso, } if (f == NULL) { // Try with the OES postfix - ssize_t index = ssize_t(strlen(name)) - 3; + ssize_t size = ssize_t(strlen(name)); + ssize_t index = size - 3; if ((index>0 && (index<252)) && (strcmp(name+index, "OES"))) { - strncpy(scrap, name, index); - scrap[index] = 0; - strcat(scrap, "OES"); + strncpy(scrap, name, sizeof(scrap) - 1); + scrap[size] = 0; + strncat(scrap, "OES", sizeof(scrap) - 1); + scrap[size + 3] = 0; f = (__eglMustCastToProperFunctionPointerType)dlsym(dso, scrap); //LOGD_IF(f, "found <%s> instead", scrap); }