mesa: Changes to 'ubuntu'

[Bryce Harrington <bryce-guest@alioth.debian.org>]

 debian/changelog                            |    8 ++++++++
 debian/patches/series                       |    1 +
 src/gallium/winsys/radeon/drm/radeon_r300.c |    2 +-
 3 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 5b980f2bc060c88bbdd54cad6a2794755b480b24
Author: Bryce Harrington <bryce@canonical.com>
Date:   Wed Jan 12 08:58:38 2011 -0800

    debian/patches/winsys_buffer_nullptr.patch: Null pointer check for winsys buffer. (LP: #691653)

diff --git a/debian/changelog b/debian/changelog
index 554d505..3fb9670 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mesa (7.9+repack-1ubuntu4~bug691653~bwh2) natty; urgency=low
+
+  * debian/patches/winsys_buffer_nullptr.patch: Null pointer check for
+    winsys buffer.
+    (LP: #691653)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Thu, 06 Jan 2011 14:44:43 -0800
+
 mesa (7.9+repack-1ubuntu3) natty; urgency=low
 
   * debian/patches/106_fix_renderbuffer_segfault.patch:
diff --git a/debian/patches/series b/debian/patches/series
index 8402459..74f3c60 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@
 104_i915_fragment_shader_disable.patch
 105_use_shared_libdricore.patch
 106_fix_renderbuffer_segfault.patch
+winsys_buffer_nullptr.patch
diff --git a/src/gallium/winsys/radeon/drm/radeon_r300.c b/src/gallium/winsys/radeon/drm/radeon_r300.c
index 420522f..2d1bd1e 100644
--- a/src/gallium/winsys/radeon/drm/radeon_r300.c
+++ b/src/gallium/winsys/radeon/drm/radeon_r300.c
@@ -119,7 +119,7 @@ static struct r300_winsys_buffer *radeon_r300_winsys_buffer_from_handle(struct r
 
     if (stride)
         *stride = whandle->stride;
-    if (size)
+    if (size && _buf)
         *size = _buf->base.size;
 
     return radeon_libdrm_winsys_buffer(_buf);