Slightly safer use of isWriteable in BasicIo funcs

Author: jim-easterbrook

src/interface/basicio.i

@@ -132,12 +132,14 @@ OUTPUT_BUFFER_RW(Exiv2::byte* buf, size_t rcount)
 %typemap(default) bool isWriteable {$1 = false;}
 %ignore Exiv2::BasicIo::mmap();
 
-// Convert mmap() result to a Python memoryview, assumes arg2 = isWriteable
+// Convert mmap() result to a Python memoryview
 RETURN_VIEW(Exiv2::byte* mmap, $1 ? arg1->size() : 0,
-            arg2 ? PyBUF_WRITE : PyBUF_READ,)
+            _global_writeable ? PyBUF_WRITE : PyBUF_READ,)
 
-// Release memoryviews when mmap or data is called
-%typemap(check, fragment="memoryview_funcs") bool isWriteable {
+// Release memoryviews (and save isWriteable) when mmap or data is called
+%typemap(check, fragment="memoryview_funcs") bool isWriteable
+        (bool _global_writeable) {
+    _global_writeable = $1;
     release_views(self);
 }
 
@@ -151,7 +153,7 @@ RETURN_VIEW(Exiv2::byte* mmap, $1 ? arg1->size() : 0,
 // Add data() method for easy access
 // The callback is used to call munmap when the memoryview is deleted
 RETURN_VIEW_CB(Exiv2::byte* data, $1 ? arg1->size() : 0,
-               arg2 ? PyBUF_WRITE : PyBUF_READ,
+               _global_writeable ? PyBUF_WRITE : PyBUF_READ,
                PyObject_GetAttrString(self, "_release"),)
 %extend Exiv2::BasicIo {
     Exiv2::byte* data(bool isWriteable) {

src/swig-0_27_7/basicio_wrap.cxx

@@ -5469,6 +5469,7 @@ SWIGINTERN PyObject *_wrap_BasicIo_mmap(PyObject *self, PyObject *args) {
   int res1 = 0 ;
   bool val2 ;
   int ecode2 = 0 ;
+  bool _global_writeable ;
   PyObject * obj1 = 0 ;
   Exiv2::byte *result = 0 ;
 
@@ -5489,6 +5490,7 @@ SWIGINTERN PyObject *_wrap_BasicIo_mmap(PyObject *self, PyObject *args) {
     arg2 = static_cast< bool >(val2);
   }
   {
+    _global_writeable = arg2;
     release_views(self);
   }
   {
@@ -5505,7 +5507,7 @@ SWIGINTERN PyObject *_wrap_BasicIo_mmap(PyObject *self, PyObject *args) {
     }
   }
 
-  resultobj = PyMemoryView_FromMemory((char*)result, result ? arg1->size() : 0, arg2 ? PyBUF_WRITE : PyBUF_READ);
+  resultobj = PyMemoryView_FromMemory((char*)result, result ? arg1->size() : 0, _global_writeable ? PyBUF_WRITE : PyBUF_READ);
   if (!resultobj)
   SWIG_fail;
   // Store a weak ref to the new memoryview
@@ -5734,6 +5736,7 @@ SWIGINTERN PyObject *_wrap_BasicIo_data(PyObject *self, PyObject *args) {
   int res1 = 0 ;
   bool val2 ;
   int ecode2 = 0 ;
+  bool _global_writeable ;
   PyObject * obj1 = 0 ;
   Exiv2::byte *result = 0 ;
 
@@ -5754,6 +5757,7 @@ SWIGINTERN PyObject *_wrap_BasicIo_data(PyObject *self, PyObject *args) {
     arg2 = static_cast< bool >(val2);
   }
   {
+    _global_writeable = arg2;
     release_views(self);
   }
   {
@@ -5770,7 +5774,7 @@ SWIGINTERN PyObject *_wrap_BasicIo_data(PyObject *self, PyObject *args) {
     }
   }
 
-  resultobj = PyMemoryView_FromMemory((char*)result, result ? arg1->size() : 0, arg2 ? PyBUF_WRITE : PyBUF_READ);
+  resultobj = PyMemoryView_FromMemory((char*)result, result ? arg1->size() : 0, _global_writeable ? PyBUF_WRITE : PyBUF_READ);
   if (!resultobj)
   SWIG_fail;
   // Store a weak ref to the new memoryview

src/swig-0_28_5/basicio_wrap.cxx

@@ -5736,6 +5736,7 @@ SWIGINTERN PyObject *_wrap_BasicIo_mmap(PyObject *self, PyObject *args) {
   int res1 = 0 ;
   bool val2 ;
   int ecode2 = 0 ;
+  bool _global_writeable ;
   PyObject * obj1 = 0 ;
   Exiv2::byte *result = 0 ;
 
@@ -5756,6 +5757,7 @@ SWIGINTERN PyObject *_wrap_BasicIo_mmap(PyObject *self, PyObject *args) {
     arg2 = static_cast< bool >(val2);
   }
   {
+    _global_writeable = arg2;
     release_views(self);
   }
   {
@@ -5772,7 +5774,7 @@ SWIGINTERN PyObject *_wrap_BasicIo_mmap(PyObject *self, PyObject *args) {
     }
   }
 
-  resultobj = PyMemoryView_FromMemory((char*)result, result ? arg1->size() : 0, arg2 ? PyBUF_WRITE : PyBUF_READ);
+  resultobj = PyMemoryView_FromMemory((char*)result, result ? arg1->size() : 0, _global_writeable ? PyBUF_WRITE : PyBUF_READ);
   if (!resultobj)
   SWIG_fail;
   // Store a weak ref to the new memoryview
@@ -6002,6 +6004,7 @@ SWIGINTERN PyObject *_wrap_BasicIo_data(PyObject *self, PyObject *args) {
   int res1 = 0 ;
   bool val2 ;
   int ecode2 = 0 ;
+  bool _global_writeable ;
   PyObject * obj1 = 0 ;
   Exiv2::byte *result = 0 ;
 
@@ -6022,6 +6025,7 @@ SWIGINTERN PyObject *_wrap_BasicIo_data(PyObject *self, PyObject *args) {
     arg2 = static_cast< bool >(val2);
   }
   {
+    _global_writeable = arg2;
     release_views(self);
   }
   {
@@ -6038,7 +6042,7 @@ SWIGINTERN PyObject *_wrap_BasicIo_data(PyObject *self, PyObject *args) {
     }
   }
 
-  resultobj = PyMemoryView_FromMemory((char*)result, result ? arg1->size() : 0, arg2 ? PyBUF_WRITE : PyBUF_READ);
+  resultobj = PyMemoryView_FromMemory((char*)result, result ? arg1->size() : 0, _global_writeable ? PyBUF_WRITE : PyBUF_READ);
   if (!resultobj)
   SWIG_fail;
   // Store a weak ref to the new memoryview