diff options
| author | Brian Paul <[email protected]> | 2012-03-16 09:31:13 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2012-03-17 16:15:59 -0600 |
| commit | 03f8a97d718502f60d16000aead251d88a751149 (patch) | |
| tree | 3cc334988a4eb13ac591f3c03bd6fe8d315e147a /src/mesa/state_tracker/st_texture.c | |
| parent | c3fe44c5f9e8e99059d2fe4d85f24cdae89875e2 (diff) | |
st/mesa: add null pointer check in st_texture_image_map()
If we failed to allocate a memory resource for the texture we'd crash
when we tried to map it. Now we propogate the NULL back up to the
texstore code and generate GL_OUT_OF_MEMORY.
Fixes a crash with the upcoming piglit max-texture-size test.
NOTE: This is a candidate for the 8.0 branch.
Reviewed-by: José Fonseca <[email protected]>
Diffstat (limited to 'src/mesa/state_tracker/st_texture.c')
| -rw-r--r-- | src/mesa/state_tracker/st_texture.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/mesa/state_tracker/st_texture.c b/src/mesa/state_tracker/st_texture.c index 132d7a81c63..9627a61177c 100644 --- a/src/mesa/state_tracker/st_texture.c +++ b/src/mesa/state_tracker/st_texture.c @@ -222,6 +222,9 @@ st_texture_image_map(struct st_context *st, struct st_texture_image *stImage, DBG("%s \n", __FUNCTION__); + if (!stImage->pt) + return NULL; + if (stObj->pt != stImage->pt) level = 0; else |