Attachment 80036 Details for Bug 65173 – fix

fix

fix-segfault-_mesa_get_color_read_type-format.diff (text/plain), 1.28 KB, created by Vedran Rodic on 2013-05-30 12:10:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vedran Rodic

Created: 2013-05-30 12:10:37 UTC

Size: 1.28 KB

patch

obsolete

>diff --git a/src/mesa/main/framebuffer.c b/src/mesa/main/framebuffer.c
>index af3c595..eb29bc5 100644
>--- a/src/mesa/main/framebuffer.c
>+++ b/src/mesa/main/framebuffer.c
>@@ -878,8 +878,13 @@ _mesa_dest_buffer_exists(struct gl_context *ctx, GLenum format)
> GLenum
> _mesa_get_color_read_format(struct gl_context *ctx)
> {
>-   const GLenum data_type = _mesa_get_format_datatype(
>+   GLenum data_type;
>+   if (ctx->ReadBuffer != NULL &&  ctx->ReadBuffer->_ColorReadBuffer != NULL) {
>+		   data_type = _mesa_get_format_datatype(
>                                ctx->ReadBuffer->_ColorReadBuffer->Format);
>+   } else {
>+	   return 0;
>+   }
> 
>    switch (ctx->ReadBuffer->_ColorReadBuffer->Format) {
>    case MESA_FORMAT_ARGB8888:
>@@ -902,8 +907,13 @@ _mesa_get_color_read_format(struct gl_context *ctx)
> GLenum
> _mesa_get_color_read_type(struct gl_context *ctx)
> {
>-   const GLenum data_type = _mesa_get_format_datatype(
>-                               ctx->ReadBuffer->_ColorReadBuffer->Format);
>+   GLenum data_type;
>+   if (ctx->ReadBuffer != NULL &&  ctx->ReadBuffer->_ColorReadBuffer != NULL) {
>+	  data_type = _mesa_get_format_datatype(
>+			  ctx->ReadBuffer->_ColorReadBuffer->Format);
>+   } else {
>+	   return 0;
>+   }
> 
>    switch (ctx->ReadBuffer->_ColorReadBuffer->Format) {
>    case MESA_FORMAT_RGB565:

Actions: View

Attachments on bug 65173: 80036 | 80037 | 80070 | 80099

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.