diffdiff -ur gsoap2-code-r193/gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.cpp gsoap2-code-r194/gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.cpp
--- gsoap2-code-r193/gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.cpp	2021-01-17 20:13:51.000000000 +0100
+++ gsoap2-code-r194/gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.cpp	2021-01-22 23:49:26.000000000 +0100
@@ -21246,7 +21243,7 @@
       if (*s == ':')
       {
         s++;
-        if (*s != '@')
+        if (*s != '@' && s < t)
         {
           l = t - s + 1;
           r = r + strlen(r) + 1;
diff -ur gsoap2-code-r193/gsoap/stdsoap2.c gsoap2-code-r194/gsoap/stdsoap2.c
--- gsoap2-code-r193/gsoap/stdsoap2.c	2021-01-17 20:13:51.000000000 +0100
+++ gsoap2-code-r194/gsoap/stdsoap2.c	2021-01-22 23:49:26.000000000 +0100
@@ -21246,7 +21243,7 @@
       if (*s == ':')
       {
         s++;
-        if (*s != '@')
+        if (*s != '@' && s < t)
         {
           l = t - s + 1;
           r = r + strlen(r) + 1;
diff -ur gsoap2-code-r193/gsoap/stdsoap2.cpp gsoap2-code-r194/gsoap/stdsoap2.cpp
--- gsoap2-code-r193/gsoap/stdsoap2.cpp	2021-01-17 20:13:51.000000000 +0100
+++ gsoap2-code-r194/gsoap/stdsoap2.cpp	2021-01-22 23:49:26.000000000 +0100
@@ -21246,7 +21243,7 @@
       if (*s == ':')
       {
         s++;
-        if (*s != '@')
+        if (*s != '@' && s < t)
         {
           l = t - s + 1;
           r = r + strlen(r) + 1;