Merge pull request #38 from guzman-raphael/master

Fix nullable blobs
datajoint · Feb 26, 2020 · 034f9c6 · 034f9c6
2 parents 3e9e199 + 06aa8ab
commit 034f9c6
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/distribution/mexa64/mym.mexa64 b/distribution/mexa64/mym.mexa64
diff --git a/distribution/mexmaci64/mym.mexmaci64 b/distribution/mexmaci64/mym.mexmaci64
diff --git a/distribution/mexw64/mym.mexw64 b/distribution/mexw64/mym.mexw64
diff --git a/src/mym.cpp b/src/mym.cpp
@@ -494,7 +494,7 @@ void mexFunction(int nlhs, mxArray*plhs[], int nrhs, const mxArray*prhs[]) {
         }
         else if (strstr (ssl_input,"{")) {
             mode_option = SSL_MODE_REQUIRED;
-            mexErrMsgIdAndTxt("DataJoint:TLS:InvalidStruct",
+            mexErrMsgIdAndTxt("mYm:TLS:InvalidStruct",
                 "Custom TLS struct definition not supported yet.");
         }
 
@@ -1727,15 +1727,15 @@ static void getSerialFct(const char* rpt, const mxArray* rparg, pfserial& rpf, b
 
 // entry point
 mxArray* deserialize(const char* rpSerial, const size_t rlength) {
-    if (!strcasecmp(rpSerial, "dj0"))
-        mexErrMsgIdAndTxt("DataJoint:CrossPlatform:Compatibility",
-                "Blob data ingested utilizing DataJoint-Python version >=0.12 not yet supported.");
     mxArray* p_res = NULL;
     bool could_not_deserialize = true;
     bool used_compression = false;
     char* p_cmp = NULL;
     const char* p_serial = rpSerial;
     size_t length = rlength;
+    if (p_serial != 0 && !strcasecmp(rpSerial, "dj0"))
+        mexErrMsgIdAndTxt("mYm:CrossPlatform:Compatibility",
+                "Blob data ingested utilizing DataJoint-Python version >=0.12 not yet supported.");
     if (p_serial==0) {
         // the row is empty: return an empty array
         p_res = mxCreateNumericArray(0, 0, mxCHAR_CLASS, mxREAL);

diff --git a/src/mym.h b/src/mym.h
@@ -34,7 +34,7 @@
 // mym version information
 #define MYM_VERSION_MAJOR 2
 #define MYM_VERSION_MINOR 7
-#define MYM_VERSION_BUGFIX 0
+#define MYM_VERSION_BUGFIX 1
 
 
 // some local defintion