Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 8fc3540f: Merge "be a bit more defensive when parsing extension strings" into ics-mr1

Browse Source 
* commit '8fc3540fdf759ff3bb03b00e81d94d6c4102d530':
  be a bit more defensive when parsing extension strings
This commit is contained in:
Mathias Agopian
2011-11-16 21:00:52 -08:00
committed by Android Git Automerger
parent e788fa84f1 8fc3540fdf
commit 2030d78dc9
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
opengl/libs/EGL/egl_display.cpp
View File

@@ -220,15 +220,19 @@ EGLBoolean egl_display_t::initialize(EGLint *major, EGLint *minor) {
if (end) {
// length of the extension string
const size_t len = end - start;
// NOTE: we could avoid the copy if we had strnstr.
const String8 ext(start, len);
// now go through all implementations and look for this extension
for (int i = 0; i < IMPL_NUM_IMPLEMENTATIONS; i++) {
// if we find it, add this extension string to our list
// (and don't forget the space)
const char* match = strstr(disp[i].queryString.extensions, ext.string());
if (match && (match[len] == ' ' || match[len] == 0)) {
mExtensionString.append(start, len+1);
if (len) {
// NOTE: we could avoid the copy if we had strnstr.
const String8 ext(start, len);
// now go through all implementations and look for this extension
for (int i = 0; i < IMPL_NUM_IMPLEMENTATIONS; i++) {
if (disp[i].queryString.extensions) {
// if we find it, add this extension string to our list
// (and don't forget the space)
const char* match = strstr(disp[i].queryString.extensions, ext.string());
if (match && (match[len] == ' ' || match[len] == 0)) {
mExtensionString.append(start, len+1);
}
}
}
}
// process the next extension string, and skip the space.