From 258ab1a92cd41bac8052f3207fd50b0efb724efe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Thu, 26 May 2016 17:14:16 +0200
Subject: [PATCH] Disallow calling data() on rvalue Image and Trade::ImageData.

That would cause accessing freed data. Use release() instead (and then
you are on your own). The AbstractShaderProgram GL test now fails to
compile.
---
 src/Magnum/Image.h           | 18 ++++++++++++++++--
 src/Magnum/Trade/ImageData.h | 18 ++++++++++++++++--
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/src/Magnum/Image.h b/src/Magnum/Image.h
index f5af9a50b..50762aadf 100644
--- a/src/Magnum/Image.h
+++ b/src/Magnum/Image.h
@@ -144,10 +144,24 @@ template<UnsignedInt dimensions> class Image {
          *
          * @see @ref release()
          */
-        Containers::ArrayView<char> data() { return _data; }
+        Containers::ArrayView<char> data()
+            #ifndef CORRADE_GCC47_COMPATIBILITY
+            &
+            #endif
+            { return _data; }
+        #ifndef CORRADE_GCC47_COMPATIBILITY
+        Containers::ArrayView<char> data() && = delete; /**< @overload */
+        #endif
 
         /** @overload */
-        Containers::ArrayView<const char> data() const { return _data; }
+        Containers::ArrayView<const char> data() const
+            #ifndef CORRADE_GCC47_COMPATIBILITY
+            &
+            #endif
+            { return _data; }
+        #ifndef CORRADE_GCC47_COMPATIBILITY
+        Containers::ArrayView<const char> data() const && = delete; /**< @overload */
+        #endif
 
         /** @overload */
         template<class T = char> T* data() {
diff --git a/src/Magnum/Trade/ImageData.h b/src/Magnum/Trade/ImageData.h
index 7ff2e5561..2c6492aa0 100644
--- a/src/Magnum/Trade/ImageData.h
+++ b/src/Magnum/Trade/ImageData.h
@@ -221,10 +221,24 @@ template<UnsignedInt dimensions> class ImageData {
          *
          * @see @ref release()
          */
-        Containers::ArrayView<char> data() { return _data; }
+        Containers::ArrayView<char> data()
+            #ifndef CORRADE_GCC47_COMPATIBILITY
+            &
+            #endif
+            { return _data; }
+        #ifndef CORRADE_GCC47_COMPATIBILITY
+        Containers::ArrayView<char> data() && = delete; /**< @overload */
+        #endif
 
         /** @overload */
-        Containers::ArrayView<const char> data() const { return _data; }
+        Containers::ArrayView<const char> data() const
+            #ifndef CORRADE_GCC47_COMPATIBILITY
+            &
+            #endif
+            { return _data; }
+        #ifndef CORRADE_GCC47_COMPATIBILITY
+        Containers::ArrayView<const char> data() const && = delete; /**< @overload */
+        #endif
 
         /** @overload */
         template<class T> T* data() {