Mercurial > vim
view src/iscygpty.c @ 33815:08f9e1eac4cf v9.0.2123
patch 9.0.2123: Problem with initializing the length of range() lists
Commit: https://github.com/vim/vim/commit/df63da98d8dc284b1c76cfe1b17fa0acbd6094d8
Author: Christian Brabandt <cb@256bit.org>
Date: Thu Nov 23 20:14:28 2023 +0100
patch 9.0.2123: Problem with initializing the length of range() lists
Problem: Problem with initializing the length of range() lists
Solution: Set length explicitly when it shouldn't contain any items
range() may cause a wrong calculation of list length, which may later
then cause a segfault in list_find(). This is usually not a problem,
because range_list_materialize() calculates the length, when it
materializes the list.
In addition, in list_find() when the length of the range was wrongly
initialized, it may seem to be valid, so the check for list index
out-of-bounds will not be true, because it is called before the list is
actually materialized. And so we may eventually try to access a null
pointer, causing a segfault.
So this patch does 3 things:
- In f_range(), when we know that the list should be empty, explicitly
set the list->lv_len value to zero. This should happen, when
start is larger than end (in case the stride is positive) or
end is larger than start when the stride is negative.
This should fix the underlying issue properly. However,
- as a safety measure, let's check that the requested index is not
out of range one more time, after the list has been materialized
and return NULL in case it suddenly is.
- add a few more tests to verify the behaviour.
fixes: #13557
closes: #13563
Co-authored-by: Tim Pope <tpope@github.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Thu, 23 Nov 2023 20:30:07 +0100 |
parents | 1ffdcd8a424e |
children |
line wrap: on
line source
/* * iscygpty.c -- part of ptycheck * https://github.com/k-takata/ptycheck * * Copyright (c) 2015-2023 K.Takata * * You can redistribute it and/or modify it under the terms of either * the MIT license (as described below) or the Vim license. * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the * "Software"), to deal in the Software without restriction, including * without limitation the rights to use, copy, modify, merge, publish, * distribute, sublicense, and/or sell copies of the Software, and to * permit persons to whom the Software is furnished to do so, subject to * the following conditions: * * The above copyright notice and this permission notice shall be * included in all copies or substantial portions of the Software. * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #ifdef _WIN32 #include <ctype.h> #include <io.h> #include <wchar.h> #include <windows.h> #ifdef USE_FILEEXTD // VC 7.1 or earlier doesn't support SAL. # if !defined(_MSC_VER) || (_MSC_VER < 1400) # define __out # define __in # define __in_opt # endif // Win32 FileID API Library: // http://www.microsoft.com/en-us/download/details.aspx?id=22599 // Needed for WinXP. # include <fileextd.h> #else // USE_FILEEXTD // VC 8 or earlier. # if defined(_MSC_VER) && (_MSC_VER < 1500) # ifdef ENABLE_STUB_IMPL # define STUB_IMPL # else # error "Win32 FileID API Library is required for VC2005 or earlier." # endif # endif #endif // USE_FILEEXTD #ifdef __MINGW32__ # define UNUSED __attribute__((unused)) #else # define UNUSED #endif #include "iscygpty.h" //#define USE_DYNFILEID #ifdef USE_DYNFILEID typedef BOOL (WINAPI *pfnGetFileInformationByHandleEx)( HANDLE hFile, FILE_INFO_BY_HANDLE_CLASS FileInformationClass, LPVOID lpFileInformation, DWORD dwBufferSize); static pfnGetFileInformationByHandleEx pGetFileInformationByHandleEx = NULL; # ifndef USE_FILEEXTD static BOOL WINAPI stub_GetFileInformationByHandleEx( HANDLE hFile UNUSED, FILE_INFO_BY_HANDLE_CLASS FileInformationClass UNUSED, LPVOID lpFileInformation UNUSED, DWORD dwBufferSize UNUSED) { return FALSE; } # endif static void setup_fileid_api(void) { if (pGetFileInformationByHandleEx != NULL) { return; } pGetFileInformationByHandleEx = (pfnGetFileInformationByHandleEx) GetProcAddress(GetModuleHandle(TEXT("kernel32.dll")), "GetFileInformationByHandleEx"); if (pGetFileInformationByHandleEx == NULL) { # ifdef USE_FILEEXTD pGetFileInformationByHandleEx = GetFileInformationByHandleEx; # else pGetFileInformationByHandleEx = stub_GetFileInformationByHandleEx; # endif } } #else # define pGetFileInformationByHandleEx GetFileInformationByHandleEx # define setup_fileid_api() #endif #define is_wprefix(s, prefix) \ (wcsncmp((s), (prefix), sizeof(prefix) / sizeof(WCHAR) - 1) == 0) // Check if the fd is a cygwin/msys's pty. int is_cygpty(int fd) { #ifdef STUB_IMPL return 0; #else HANDLE h; const int size = sizeof(FILE_NAME_INFO) + sizeof(WCHAR) * (MAX_PATH - 1); FILE_NAME_INFO *nameinfo; WCHAR *p = NULL; setup_fileid_api(); h = (HANDLE) _get_osfhandle(fd); if (h == INVALID_HANDLE_VALUE) { return 0; } // Cygwin/msys's pty is a pipe. if (GetFileType(h) != FILE_TYPE_PIPE) { return 0; } nameinfo = malloc(size + sizeof(WCHAR)); if (nameinfo == NULL) { return 0; } // Check the name of the pipe: // "\\{cygwin,msys}-XXXXXXXXXXXXXXXX-ptyN-{from,to}-master" if (pGetFileInformationByHandleEx(h, FileNameInfo, nameinfo, size)) { nameinfo->FileName[nameinfo->FileNameLength / sizeof(WCHAR)] = L'\0'; p = nameinfo->FileName; if (is_wprefix(p, L"\\cygwin-")) { // Cygwin p += 8; } else if (is_wprefix(p, L"\\msys-")) { // MSYS and MSYS2 p += 6; } else { p = NULL; } if (p != NULL) { // Skip 16-digit hexadecimal. while (*p && iswascii(*p) && isxdigit(*p)) ++p; if (is_wprefix(p, L"-pty")) { p += 4; } else { p = NULL; } } if (p != NULL) { // Skip pty number. while (*p && iswascii(*p) && isdigit(*p)) ++p; if (is_wprefix(p, L"-from-master")) { //p += 12; } else if (is_wprefix(p, L"-to-master")) { //p += 10; } else { p = NULL; } } } free(nameinfo); return (p != NULL); #endif // STUB_IMPL } // Check if at least one cygwin/msys pty is used. int is_cygpty_used(void) { int fd, ret = 0; for (fd = 0; fd < 3; fd++) { ret |= is_cygpty(fd); } return ret; } #endif // _WIN32 // vim: set ts=4 sw=4: