To: vim_dev@googlegroups.com Subject: Patch 8.2.0718 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.0718 Problem: Gcc warning for returning pointer to local variable. (John Marriott) Solution: Return another pointer. Files: src/evalvars.c *** ../vim-8.2.0717/src/evalvars.c 2020-05-01 15:44:24.539895251 +0200 --- src/evalvars.c 2020-05-09 13:03:45.341313485 +0200 *************** *** 2510,2515 **** --- 2510,2516 ---- return NULL; if (len < sizeof(buffer) - 1) { + // avoid an alloc/free for short names vim_strncpy(buffer, name, len); p = buffer; } *************** *** 2529,2535 **** if (p != buffer) vim_free(p); ! return res; } /* --- 2530,2537 ---- if (p != buffer) vim_free(p); ! // Don't return "buffer", gcc complains. ! return res == NULL ? NULL : IObuff; } /* *** ../vim-8.2.0717/src/version.c 2020-05-08 19:10:30.782336716 +0200 --- src/version.c 2020-05-09 13:05:30.168906376 +0200 *************** *** 748,749 **** --- 748,751 ---- { /* Add new patch number below this line */ + /**/ + 718, /**/ -- hundred-and-one symptoms of being an internet addict: 74. Your most erotic dreams are about cybersex /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///