Merge pull request #5 from hydradatabase/copy-data

Copy data and null terminate

Author: JerrySievert

Makefile

@@ -5,22 +5,22 @@ OBJS = $(subst .cpp,.o, $(SRCS))
 
 MODULE_big = stringtheory
 
-PG_CPPFLAGS = -O3 -std=c++17 -I src/sse
+PG_CXXFLAGS = -O3 -std=c++17 -I src/sse
 
 UNAME_S := $(shell uname -m)
 ifeq ($(UNAME_S),arm64)
-	PG_CPPFLAGS += -stdlib=libc++ -DHAVE_NEON_INSTRUCTIONS=1
+	PG_CXXFLAGS += -stdlib=libc++ -DHAVE_NEON_INSTRUCTIONS=1
 endif
 ifeq ($(UNAME_S),aarch64)
 	PG_CPPFLAGS += -DHAVE_NEON_INSTRUCTIONS=1
 endif
 ifeq ($(UNAME_S),x86_64)
 	SHLIB_LINK += -lrt -std=c++17 -msse4.2
-	PG_CPPFLAGS += -msse4.2
+	PG_CXXFLAGS += -msse4.2
 endif
 
 EXTENSION = stringtheory
-DATA = stringtheory--1.0.0.sql
+DATA = stringtheory--1.0.1.sql
 PGFILEDESC = "stringtheory - tools for testing equality"
 
 PG_CONFIG = pg_config

src/text.cpp

@@ -74,9 +74,16 @@ Datum pg_strstr(PG_FUNCTION_ARGS) {
     PG_RETURN_INT32(-1);
   }
 
+  /* Make a copy of the data to null terminate. */
+  char left_term[ len_left + 1 ];
+  memcpy(left_term, VARDATA_ANY(left), len_left);
+  left_term[ len_left ] = '\0';
+  char right_term[ len_right + 1 ];
+  memcpy(right_term, VARDATA_ANY(right), len_right);
+  right_term[ len_right ] = '\0';
+
   /* Get the results from the simd functions. */
-  size_t ret =
-      fast_strstr(VARDATA_ANY(left), len_left, VARDATA_ANY(right), len_right);
+  size_t ret = fast_strstr(left_term, len_left, right_term, len_right);
 
   PG_RETURN_INT32(ret);
 }

stringtheory--1.0.0.sql renamed to stringtheory--1.0.1.sql

@@ -1,5 +1,5 @@
 # compare extension
 comment = 'tools for comparing strings'
-default_version = '1.0.0'
+default_version = '1.0.1'
 module_pathname = '$libdir/stringtheory'
 relocatable = true