@@ -143,7 +143,7 @@ typedef struct
143143WORD SubstituteNameLength ;
144144WORD PrintNameOffset ;
145145WORD PrintNameLength ;
146- WCHAR PathBuffer [1 ];
146+ WCHAR PathBuffer [FLEXIBLE_ARRAY_MEMBER ];
147147}REPARSE_JUNCTION_DATA_BUFFER ;
148148
149149#define REPARSE_JUNCTION_DATA_BUFFER_HEADER_SIZE \
@@ -160,7 +160,7 @@ pgsymlink(const char *oldpath, const char *newpath)
160160{
161161HANDLE dirhandle ;
162162DWORD len ;
163- char buffer [MAX_PATH * sizeof (WCHAR )+ sizeof (REPARSE_JUNCTION_DATA_BUFFER )];
163+ char buffer [MAX_PATH * sizeof (WCHAR )+ offsetof (REPARSE_JUNCTION_DATA_BUFFER , PathBuffer )];
164164char nativeTarget [MAX_PATH ];
165165char * p = nativeTarget ;
166166REPARSE_JUNCTION_DATA_BUFFER * reparseBuf = (REPARSE_JUNCTION_DATA_BUFFER * )buffer ;
@@ -174,10 +174,10 @@ pgsymlink(const char *oldpath, const char *newpath)
174174return -1 ;
175175
176176/* make sure we have an unparsed native win32 path */
177- if (memcmp ("\\??\\" ,oldpath ,4 ))
178- sprintf (nativeTarget ,"\\??\\%s" ,oldpath );
177+ if (memcmp ("\\??\\" ,oldpath ,4 )!= 0 )
178+ snprintf (nativeTarget , sizeof ( nativeTarget ) ,"\\??\\%s" ,oldpath );
179179else
180- strcpy (nativeTarget ,oldpath );
180+ strlcpy (nativeTarget ,oldpath , sizeof ( nativeTarget ) );
181181
182182while ((p = strchr (p ,'/' ))!= NULL )
183183* p ++ = '\\' ;
@@ -239,7 +239,7 @@ pgreadlink(const char *path, char *buf, size_t size)
239239{
240240DWORD attr ;
241241HANDLE h ;
242- char buffer [MAX_PATH * sizeof (WCHAR )+ sizeof (REPARSE_JUNCTION_DATA_BUFFER )];
242+ char buffer [MAX_PATH * sizeof (WCHAR )+ offsetof (REPARSE_JUNCTION_DATA_BUFFER , PathBuffer )];
243243REPARSE_JUNCTION_DATA_BUFFER * reparseBuf = (REPARSE_JUNCTION_DATA_BUFFER * )buffer ;
244244DWORD len ;
245245int r ;