To: vim_dev@googlegroups.com Subject: Patch 8.2.4832 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.4832 Problem: Passing zero instead of NULL to a pointer argument. Solution: Use NULL. (closes #10296) Files: src/getchar.c, src/term.c *** ../vim-8.2.4831/src/getchar.c 2022-04-26 12:51:01.074682254 +0100 --- src/getchar.c 2022-04-26 22:05:49.123732576 +0100 *************** *** 2401,2414 **** if (modifier == 0) { if (put_string_in_typebuf(offset, 4, new_string, len, ! NULL, 0, 0) == FAIL) return -1; } else { tp[2] = modifier; if (put_string_in_typebuf(offset + 3, 1, new_string, len, ! NULL, 0, 0) == FAIL) return -1; } return len; --- 2401,2414 ---- if (modifier == 0) { if (put_string_in_typebuf(offset, 4, new_string, len, ! NULL, 0, NULL) == FAIL) return -1; } else { tp[2] = modifier; if (put_string_in_typebuf(offset + 3, 1, new_string, len, ! NULL, 0, NULL) == FAIL) return -1; } return len; *** ../vim-8.2.4831/src/term.c 2022-04-20 19:08:45.289292854 +0100 --- src/term.c 2022-04-26 22:09:21.647462993 +0100 *************** *** 4505,4511 **** #endif /* ! * Put "string[new_slen]" in typebuf, or in "buf[bufsize]" if "buf" is not NULL. * Remove "slen" bytes. * Returns FAIL for error. */ --- 4505,4513 ---- #endif /* ! * If "buf" is NULL put "string[new_slen]" in typebuf; "buflen" is not used. ! * If "buf" is not NULL put "string[new_slen]" in "buf[bufsize]" and adjust ! * "buflen". * Remove "slen" bytes. * Returns FAIL for error. */ *************** *** 4691,4697 **** if (version > 20000) version = 0; ! // Figure out more if the reeponse is CSI > 99 ; 99 ; 99 c if (first == '>' && argc == 3) { int need_flush = FALSE; --- 4693,4699 ---- if (version > 20000) version = 0; ! // Figure out more if the response is CSI > 99 ; 99 ; 99 c if (first == '>' && argc == 3) { int need_flush = FALSE; *************** *** 4836,4842 **** if (*T_8U != NUL && write_t_8u_state == MAYBE) // Did skip writing t_8u, a complete redraw is needed. redraw_later_clear(); ! write_t_8u_state = OK; // can otuput t_8u now // Only set 'ttymouse' automatically if it was not set // by the user already. --- 4838,4844 ---- if (*T_8U != NUL && write_t_8u_state == MAYBE) // Did skip writing t_8u, a complete redraw is needed. redraw_later_clear(); ! write_t_8u_state = OK; // can output t_8u now // Only set 'ttymouse' automatically if it was not set // by the user already. *** ../vim-8.2.4831/src/version.c 2022-04-26 21:36:14.402164072 +0100 --- src/version.c 2022-04-26 22:10:11.175400357 +0100 *************** *** 748,749 **** --- 748,751 ---- { /* Add new patch number below this line */ + /**/ + 4832, /**/ -- hundred-and-one symptoms of being an internet addict: 64. The remote to the T.V. is missing...and you don't even care. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///