Merge pull request #54 from datajoint/stage-external-storage

Fix crash related to parsing 8-byte strings
datajoint · Jul 17, 2020 · 209f45d · 209f45d
2 parents 77733f7 + 15692ce
commit 209f45d
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 4 deletions.
diff --git a/+tests/TestInsertFetch.m b/+tests/TestInsertFetch.m
@@ -9,7 +9,11 @@ function TestInsertFetch_testInsertFetch(testCase)
                 testCase.CONN_INFO.password, 'false');
             mym(curr_conn, ['create database `' testCase.PREFIX  '_insert`;']);
 
+            % test random string
             testCase.TestInsertFetch_check(testCase, curr_conn, 'varchar(7)','','S','raphael');
+            % test 8-byte ASCII string
+            testCase.TestInsertFetch_check(testCase, curr_conn, 'varchar(32)','','S', ...
+                'lteachen');
             testCase.TestInsertFetch_check(testCase, curr_conn, 'longblob','','M', ...
                 int64([1;2]));
             testCase.TestInsertFetch_check(testCase, curr_conn, 'varchar(4)','','S','ýýýý');

diff --git a/LNX-docker-compose.yml b/LNX-docker-compose.yml
@@ -11,7 +11,7 @@ services:
       - MYSQL_ROOT_PASSWORD=simple
   fakeservices.datajoint.io:
     <<: *net
-    image: raphaelguzman/nginx:v0.0.3
+    image: raphaelguzman/nginx:v0.0.8
     environment:
     - ADD_db_TYPE=DATABASE
     - ADD_db_ENDPOINT=db:3306

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/local-docker-compose.yml b/local-docker-compose.yml
@@ -16,11 +16,12 @@ services:
     #   - ./mysql/data:/var/lib/mysql
   fakeservices.datajoint.io:
     <<: *net
-    image: raphaelguzman/nginx:v0.0.3
+    image: raphaelguzman/nginx:v0.0.8
     environment:
     - ADD_db_TYPE=DATABASE
     - ADD_db_ENDPOINT=db:3306
     ports:
+      - "80:80"
       - "443:443"
       - "3306:3306"
     depends_on:

diff --git a/src/mym.cpp b/src/mym.cpp
@@ -1535,7 +1535,7 @@ char* serializeString(size_t &rnBytes, const mxArray*rpArray, const char*rpArg,
         // matlab string
         p_buf = (char*)mxCalloc(length+1, sizeof(char));
         p_buf = mxArrayToString(rpArray);
-        p_buf = char2hex(p_buf, strlen(p_buf), length);
+        p_buf = char2hex(p_buf, strlen(p_buf), length + 1);
         rnBytes = length;
     }
     else if (mxIsNumeric(rpArray)||mxIsLogical(rpArray)) {

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 8
-#define MYM_VERSION_BUGFIX 1
+#define MYM_VERSION_BUGFIX 2
 
 
 // some local defintion