safer version of text2mecab (r9y9#4)

* safer version of text2mecab

* guard strlen(NULL)

* prohibit 0-length output for text2mecab_s

* merge text2mecab_s to original text2mecab

* Update src/text2mecab/text2mecab.c

Co-authored-by: Hiroshiba <[email protected]>

Author: Yosshi999

src/bin/open_jtalk.c

@@ -172,7 +172,10 @@ static int Open_JTalk_synthesis(Open_JTalk * open_jtalk, const char *txt, FILE *
    int result = 0;
    char buff[MAXBUFLEN];
 
-   text2mecab(buff, txt);
+   errno_t mecab_result = text2mecab(buff, MAXBUFLEN, txt);
+   if (mecab_result != 0) {
+      return 0;
+   }
    Mecab_analysis(&open_jtalk->mecab, buff);
    mecab2njd(&open_jtalk->njd, Mecab_get_feature(&open_jtalk->mecab),
              Mecab_get_size(&open_jtalk->mecab));

src/text2mecab/text2mecab.c

@@ -92,8 +92,11 @@ static int strtopcmp(const char *str, const char *pattern)
    }
 }
 
-void text2mecab(char *output, const char *input)
+errno_t text2mecab(char *output, size_t sizeOfOutput, const char *input)
 {
+   if (input == NULL || output == NULL || sizeOfOutput == 0)
+      return EINVAL;
+
    int i, j;
    const int length = strlen(input);
    const char *str;
@@ -112,6 +115,10 @@ void text2mecab(char *output, const char *input)
          /* convert */
          s += e;
          str = text2mecab_conv_list[i + 1];
+         if (index + strlen(str) >= sizeOfOutput) {
+            output[0] = '\0';
+            return ERANGE;
+         }
          for (j = 0; str[j] != '\0'; j++)
             output[index++] = str[j];
       } else if (text2mecab_control_range[0] <= str[0] && str[0] <= text2mecab_control_range[1]) {
@@ -127,6 +134,10 @@ void text2mecab(char *output, const char *input)
             }
          }
          if (e > 0) {
+            if (index + e >= sizeOfOutput) {
+               output[0] = '\0';
+               return ERANGE;
+            }
             for (j = 0; j < e; j++)
                output[index++] = input[s++];
          } else {
@@ -137,6 +148,7 @@ void text2mecab(char *output, const char *input)
       }
    }
    output[index] = '\0';
+   return 0;
 }
 
 TEXT2MECAB_C_END;

src/text2mecab/text2mecab.h

@@ -51,7 +51,7 @@
 
 TEXT2MECAB_H_START;
 
-void text2mecab(char *output, const char *input);
+errno_t text2mecab(char *output, size_t sizeOfOutput, const char *input);
 
 TEXT2MECAB_H_END;