com php-src: fix stack overflow: TSRM/tsrm_win32.c

From: Date: Sat, 10 Oct 2015 15:31:05 +0000
Subject: com php-src: fix stack overflow: TSRM/tsrm_win32.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-89360@lists.php.net to get a copy of this message
Commit: 5b58d85186e04c6f85ea0e6bef4102de5a55bc80 Author: Anatol Belski <ab@php.net> Tue, 22 Sep 2015 21:12:05 +0200 Parents: abeb29a274a54686b1fe09690611d64a2ea4e770 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5b58d85186e04c6f85ea0e6bef4102de5a55bc80 Log: fix stack overflow Changed paths: M TSRM/tsrm_win32.c Diff: diff --git a/TSRM/tsrm_win32.c b/TSRM/tsrm_win32.c index 9f900f2..e8ec186 100644 --- a/TSRM/tsrm_win32.c +++ b/TSRM/tsrm_win32.c @@ -599,8 +599,10 @@ TSRM_API int shmget(int key, int size, int flags) return -1; } - sprintf(shm_segment, "TSRM_SHM_SEGMENT:%d", key); - sprintf(shm_info, "TSRM_SHM_DESCRIPTOR:%d", key); + snprintf(shm_segment, sizeof(shm_segment)-1, "TSRM_SHM_SEGMENT:%d", key); + snprintf(shm_info, sizeof(shm_info)-1, "TSRM_SHM_DESCRIPTOR:%d", key); + shm_segment[sizeof(shm_segment)-1] = '\0'; + shm_info[sizeof(shm_info)-1] = '\0'; shm_handle = OpenFileMapping(FILE_MAP_ALL_ACCESS, FALSE, shm_segment); info_handle = OpenFileMapping(FILE_MAP_ALL_ACCESS, FALSE, shm_info);

« previous php.cvs (#89360) next »