patch 8.1.0944: format of nbdbg() arguments is not checked
Problem: Format of nbdbg() arguments is not checked.
Solution: Add format attribute. Fix reported problems. (Dominique Pelle,
closes #3992)
diff --git a/src/nbdebug.h b/src/nbdebug.h
index 6331f49..16dd847 100644
--- a/src/nbdebug.h
+++ b/src/nbdebug.h
@@ -42,7 +42,11 @@
} WtWait;
-void nbdbg(char *, ...);
+void nbdbg(char *, ...)
+#ifdef USE_PRINTF_FORMAT_ATTRIBUTE
+ __attribute__((format(printf, 1, 2)))
+#endif
+;
void nbdebug_wait(u_int wait_flags, char *wait_var, u_int wait_secs);
void nbdebug_log_init(char *log_var, char *level_var);
diff --git a/src/netbeans.c b/src/netbeans.c
index 2682d1c..e49797a 100644
--- a/src/netbeans.c
+++ b/src/netbeans.c
@@ -934,7 +934,7 @@
{
mch_memmove(newtext, oldtext, first);
STRMOVE(newtext + first, oldtext + lastbyte + 1);
- nbdebug((" NEW LINE %d: %s\n", lnum, newtext));
+ nbdebug((" NEW LINE %ld: %s\n", lnum, newtext));
ml_replace(lnum, newtext, FALSE);
}
}
@@ -1166,7 +1166,7 @@
return FAIL;
}
first = *pos;
- nbdebug((" FIRST POS: line %d, col %d\n",
+ nbdebug((" FIRST POS: line %ld, col %d\n",
first.lnum, first.col));
pos = off2pos(buf->bufp, off+count-1);
if (!pos)
@@ -1178,7 +1178,7 @@
return FAIL;
}
last = *pos;
- nbdebug((" LAST POS: line %d, col %d\n",
+ nbdebug((" LAST POS: line %ld, col %d\n",
last.lnum, last.col));
del_from_lnum = first.lnum;
del_to_lnum = last.lnum;
@@ -1264,7 +1264,7 @@
}
}
- nbdebug((" Deleting lines %d through %d\n",
+ nbdebug((" Deleting lines %ld through %ld\n",
del_from_lnum, del_to_lnum));
curwin->w_cursor.lnum = del_from_lnum;
curwin->w_cursor.col = 0;
@@ -1540,7 +1540,7 @@
{
if (!buf->bufp->b_netbeans_file)
{
- nbdebug(("E658: NetBeans connection lost for buffer %ld\n", buf->bufp->b_fnum));
+ nbdebug(("E658: NetBeans connection lost for buffer %d\n", buf->bufp->b_fnum));
semsg(_("E658: NetBeans connection lost for buffer %d"),
buf->bufp->b_fnum);
}
diff --git a/src/version.c b/src/version.c
index a59e185..b3244c1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -780,6 +780,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 944,
+/**/
943,
/**/
942,