com php-src: fix stack overflow: TSRM/tsrm_win32.c
| From: | Anatol Belski | Date: | Sat, 10 Oct 2015 16:37:16 +0000 |
| Subject: | com php-src: fix stack overflow: TSRM/tsrm_win32.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-89362@lists.php.net to get a copy of this message | ||
Commit: 4224907864bbc1291262447c4e23babd7f016fb3
Author: Anatol Belski <ab@php.net> Tue, 22 Sep 2015 21:12:05 +0200
Parents: fe676968671e52b144d0919deb70492103745e9b
Branches: PHP-7.0 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4224907864bbc1291262447c4e23babd7f016fb3
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);