parser yang BUGFIX reading backslash in double-qouted string

Author: PavolVican

src/parser_yang.c

@@ -2832,7 +2832,7 @@ read_indent(const char *input, int indent, int size, int in_index, int *out_inde
 }
 
 char *
-yang_read_string(const char *input, char *output, int size, int offset, int indent, int version) {
+yang_read_string(const char *input, char *output, int size, int offset, int indent) {
     int i = 0, out_index = offset, space = 0;
 
     while (i < size) {
@@ -2865,13 +2865,9 @@ yang_read_string(const char *input, char *output, int size, int offset, int inde
                 output[out_index] = '"';
                 ++i;
             } else {
-                if (version < 2) {
-                    output[out_index] = input[i];
-                } else {
-                    /* YANG 1.1 backslash must not be followed by any other character */
-                    LOGVAL(LYE_INSTMT, LY_VLOG_NONE, NULL, input);
-                    return NULL;
-                }
+                /* backslash must not be followed by any other character */
+                LOGVAL(LYE_INSTMT, LY_VLOG_NONE, NULL, input);
+                return NULL;
             }
             break;
         default:

src/parser_yang.h

@@ -112,7 +112,7 @@ struct yang_type {
 
 #include "parser_yang_bis.h"
 
-char *yang_read_string(const char *input, char *output, int size, int offset, int indent, int version);
+char *yang_read_string(const char *input, char *output, int size, int offset, int indent);
 
 int yang_read_common(struct lys_module *module,char *value, enum yytokentype type);
 

src/parser_yang_bis.c

@@ -3029,7 +3029,7 @@ YYLTYPE yylloc = yyloc_default;
                           LOGMEM;
                           YYABORT;
                         }
-                        if (!(tmp = yang_read_string(yyget_text(scanner) + 1, s, yyget_leng(scanner) - 2, 0, yylloc.first_column, (trg) ? trg->version : 0))) {
+                        if (!(tmp = yang_read_string(yyget_text(scanner) + 1, s, yyget_leng(scanner) - 2, 0, yylloc.first_column))) {
                           YYABORT;
                         }
                         s = tmp;
@@ -3062,7 +3062,7 @@ YYLTYPE yylloc = yyloc_default;
                 }
                 s = tmp;
                 if (yyget_text(scanner)[0] == '"') {
-                  if (!(tmp = yang_read_string(yyget_text(scanner) + 1, s, length_tmp - 2, length_s, yylloc.first_column, (trg) ? trg->version : 0))) {
+                  if (!(tmp = yang_read_string(yyget_text(scanner) + 1, s, length_tmp - 2, length_s, yylloc.first_column))) {
                     YYABORT;
                   }
                   s = tmp;
@@ -5425,7 +5425,7 @@ YYLTYPE yylloc = yyloc_default;
                           }
                           if ((yyvsp[-1].nodes).node.ptr_leaflist->dflt_size && (yyvsp[-1].nodes).node.ptr_leaflist->min) {
                             LOGVAL(LYE_INCHILDSTMT, LY_VLOG_NONE, NULL, "min-elements", "leaf-list");
-                            LOGVAL(LYE_SPEC, LY_VLOG_PREV, NULL,
+                            LOGVAL(LYE_SPEC, LY_VLOG_NONE, NULL,
                                    "The \"min-elements\" statement with non-zero value is forbidden on leaf-lists with the \"default\" statement.");
                             YYABORT;
                           }