applying RH's graphviz-2.42.2-coverity-scan-fixes.patch

diff --git a/cmd/lefty/dot2l/dotlex.c b/cmd/lefty/dot2l/dotlex.c
index cf738c0c7e8292d1fee428ff2e92c251f69b76ba..65e17e2462cab67a1eb35f0903ae4beb17c46d62 100644 (file)
--- a/cmd/lefty/dot2l/dotlex.c
+++ b/cmd/lefty/dot2l/dotlex.c
@@ -252,7 +252,7 @@ static char *scan_token (char *p) {
     char *q;
 
     q = lexbuf;
-    if (p == '\0')
+    if (!p || *p == '\0')
         return NULL;
     while (isalnum (*p) || (*p == '_') || (!isascii (*p)))
         *q++ = *p++;

diff --git a/cmd/tools/gvgen.c b/cmd/tools/gvgen.c
index c2b166d44917986565ebb56cbc4d1c4dbb631ed2..c9a51e9cf777ebd17cbccaadfa2db95899ff0818 100644 (file)
--- a/cmd/tools/gvgen.c
+++ b/cmd/tools/gvgen.c
@@ -453,6 +453,8 @@ closeOpen (void)
        fprintf(opts.outfile, "}\ngraph {\n");
 }
 
+extern void makeTetrix(int depth, edgefn ef);
+
 int main(int argc, char *argv[])
 {
     GraphType graphType;