diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-02-17 19:12:21 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-02-17 19:12:21 +0100 |
| commit | c85c8fcb9fad565da78e01248c12f662f6bc04c8 (patch) | |
| tree | 243267d5088c9b49e8b907d68034f22dbad2b03d | |
| parent | 749f07c0db58d4f2fed2017f5a55bb053c9475ab (diff) | |
patch 8.1.0944: format of nbdbg() arguments is not checkedv8.1.0944
Problem: Format of nbdbg() arguments is not checked.
Solution: Add format attribute. Fix reported problems. (Dominique Pelle,
closes #3992)
| -rw-r--r-- | src/nbdebug.h | 6 | ||||
| -rw-r--r-- | src/netbeans.c | 10 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 12 insertions, 6 deletions
diff --git a/src/nbdebug.h b/src/nbdebug.h index 6331f49c3a..16dd847989 100644 --- a/src/nbdebug.h +++ b/src/nbdebug.h @@ -42,7 +42,11 @@ typedef enum { } 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 2682d1c0b6..e49797a322 100644 --- a/src/netbeans.c +++ b/src/netbeans.c @@ -934,7 +934,7 @@ nb_partialremove(linenr_T lnum, colnr_T first, colnr_T last) { 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 @@ nb_do_cmd( 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 @@ nb_do_cmd( 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 @@ nb_do_cmd( } } - 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 @@ nb_do_cmd( { 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 a59e18565a..b3244c168b 100644 --- a/src/version.c +++ b/src/version.c @@ -780,6 +780,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 944, +/**/ 943, /**/ 942, |