Redo 'Fix pulling string samples with embedded NULL bytes' b3c5886

sccn · May 11, 2021 · 679667f · 679667f
1 parent d82e8b6
commit 679667f
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/lsl_inlet_c.cpp b/src/lsl_inlet_c.cpp
@@ -116,7 +116,8 @@ LIBLSL_C_API double lsl_pull_sample_str(
 				if (ec) *ec = lsl_internal_error;
 				return 0.0;
 			}
-			strcpy(buffer[k], tmp[k].c_str());
+			memcpy(buffer[k], tmp[k].c_str(), tmp[k].size());
+			buffer[k][tmp[k].size()] = '\0';
 		}
 		return result;
 	} LSL_STORE_EXCEPTION_IN(ec)
@@ -218,7 +219,8 @@ LIBLSL_C_API unsigned long lsl_pull_chunk_str(lsl_inlet in, char **data_buffer,
 					if (ec) *ec = lsl_internal_error;
 					return 0;
 				}
-				strcpy(data_buffer[k], tmp[k].c_str());
+				memcpy(data_buffer[k], tmp[k].c_str(), tmp[k].size());
+				data_buffer[k][tmp[k].size()] = '\0';
 			}
 			return result;
 		} else
@@ -246,7 +248,8 @@ LIBLSL_C_API unsigned long lsl_pull_chunk_buf(lsl_inlet in, char **data_buffer,
 					return 0;
 				}
 				lengths_buffer[k] = (uint32_t)tmp[k].size();
-				strcpy(data_buffer[k], tmp[k].c_str());
+				memcpy(data_buffer[k], tmp[k].c_str(), tmp[k].size());
+				data_buffer[k][tmp[k].size()] = '\0';
 			}
 			return result;
 		} else