NSID hexstring length stored in nsid_len, not null-terminated.

refs #1547

src/knot/conf/cf-lex.l

@@ -209,19 +209,22 @@ on|off {
 
 [0][x]{HEXA}+ {
   lval.t = NULL;
+  lval.l = 0;
   yytext = yytext + 2; /* Cut off 0x */
   size_t dlen = strlen(yytext);
   if (dlen % 2 == 1) {
     cf_error(yyscanner, "Invalid hex-string length.");
   } else {
     dlen = dlen / 2;
-    lval.t = malloc((dlen + 1) * sizeof(char));
+    lval.t = malloc((dlen) * sizeof(char));
     if (lval.t == NULL) {
       cf_error(yyscanner, "Out of memory when allocating hex-string.\n");
     } else {
-       memset(lval.t, 0, dlen + 1);
+       memset(lval.t, 0, dlen);
        if (hex2bin(yytext, lval.t, dlen) < 0) {
          cf_error(yyscanner, "Failed to convert hex-string to binary.\n");
+       } else {
+         lval.l = dlen;
        }
     }
   }

src/knot/conf/cf-parse.y

@@ -268,7 +268,7 @@ system:
    SYSTEM '{'
  | system VERSION TEXT ';' { new_config->version = $3.t; }
  | system IDENTITY TEXT ';' { new_config->identity = $3.t; }
- | system NSID HEXSTR ';' { new_config->nsid = $3.t; }
+ | system NSID HEXSTR ';' { new_config->nsid = $3.t; new_config->nsid_len = $3.l; }
  | system STORAGE TEXT ';' { new_config->storage = $3.t; }
  | system KEY TSIG_ALGO_NAME TEXT ';' {
      fprintf(stderr, "warning: Config option 'system.key' is deprecated "

src/knot/conf/conf.h

@@ -155,6 +155,7 @@ typedef struct conf_t {
 	char *storage;  /*!< Persistent storage path for databases and such. */
 	char *pidfile;  /*!< PID file path. */
 	char *nsid;     /*!< Server's NSID. */
+	size_t nsid_len;/*!< Server's NSID length. */
 	int   workers;  /*!< Number of workers per interface. */
 	int   uid;      /*!< Specified user id. */
 	int   gid;      /*!< Specified group id. */