Changeset 5697 for pjproject/trunk/pjlib-util/src/pjlib-util/cli.c

Timestamp:

Nov 17, 2017 4:07:43 AM (6 years ago)

Author:

ming

Message:

Re #2063: Add more doc in other parts of the library

File:

• pjproject/trunk/pjlib-util/src/pjlib-util/cli.c (modified) (4 diffs)

pjproject/trunk/pjlib-util/src/pjlib-util/cli.c

@@ -695 +695 @@
             PJ_USE_EXCEPTION;
 
+            /* The buffer passed to the scanner is not NULL terminated,
+             * but should be safe. See ticket #2063.
+             */
             pj_scan_init(&scanner, attr->value.ptr, attr->value.slen,
                          PJ_SCAN_AUTOSKIP_WS, &on_syntax_error);
@@ -723 +726 @@
             }
             PJ_END;
-            
+
+            pj_scan_fini(&scanner);
+
         } else if (!pj_stricmp2(&attr->name, "desc")) {
             pj_strdup(cli->pool, &cmd->desc, &attr->value);
@@ -861 +866 @@
     pj_cli_exec_info_default(info);
 
-    /* Set the parse mode based on the latest char. */
+    /* Set the parse mode based on the latest char.
+     * And NULL terminate the buffer for the scanner.
+     */
     len = pj_ansi_strlen(cmdline);
     if (len > 0 && ((cmdline[len - 1] == '\r')||(cmdline[len - 1] == '\n'))) {
@@ -931 +938 @@
         }
         PJ_END;
+        
+        pj_scan_fini(&scanner);
     }