diff --git a/tools/csvparser.c b/tools/csvparser.c
index 8553d29ce5a..e67e51efaea 100644
--- a/tools/csvparser.c
+++ b/tools/csvparser.c
@@ -213,6 +213,12 @@ int parse_csvline(char *ptr)
 
   do
     {
+      if (nparams >= MAX_FIELDS)
+        {
+          fprintf(stderr, "%d: Too many Parameters: \"%s\"\n", g_lineno, g_line);
+          exit(8);
+        }
+
       ptr = copy_parm(ptr, &g_parm[nparms][0]);
       nparms++;
       ptr = find_parm(ptr);