* cygtls.h (TP_NUM_C_BUFS): Raise to 50 to allow SYMLOOP_MAX recursions
path_conv <-> normalize_posix_path, plus a bit of buffer. (TP_NUM_W_BUFS): Ditto. (class san): Change type of _c_cnt and _w_cnt to unsigned. * path.cc (normalize_posix_path): Guard recursion into path_conv against tmp_pathbuf overflow. Generate normalized path in call to path_conv. If the path is valid, replace dst with the normalized_path from path_conv call. Add comment to explain why we're doing this. * tls_pbuf.cc (tls_pathbuf::destroy): Only free buffers until the first buffer pointer is NULL. (tmp_pathbuf::c_get): Simplify error message. (tmp_pathbuf::w_get): Ditto. * tls_pbuf.h (class tmp_pathbuf): Change type of c_buf_old and w_buf_old to unsigned. (tmp_pathbuf::check_usage): New inline method to check if we have enough tmp_pathbuf buffers left to call a function using tmp_pathbuf buffers. * tlsoffsets.h: Regenerate. * tlsoffsets64.h: Regenerate.
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
/* tls_pbuf.h
|
||||
|
||||
Copyright 2008 Red Hat, Inc.
|
||||
Copyright 2008, 2014 Red Hat, Inc.
|
||||
|
||||
This software is a copyrighted work licensed under the terms of the
|
||||
Cygwin license. Please consult the file "CYGWIN_LICENSE" for
|
||||
@@ -8,12 +8,17 @@ details. */
|
||||
|
||||
class tmp_pathbuf
|
||||
{
|
||||
int c_buf_old;
|
||||
int w_buf_old;
|
||||
unsigned c_buf_old;
|
||||
unsigned w_buf_old;
|
||||
public:
|
||||
tmp_pathbuf ();
|
||||
~tmp_pathbuf ();
|
||||
|
||||
inline bool check_usage (unsigned c_need, unsigned w_need)
|
||||
{
|
||||
return c_need + c_buf_old < TP_NUM_C_BUFS
|
||||
&& w_need + w_buf_old < TP_NUM_W_BUFS;
|
||||
}
|
||||
char *c_get (); /* Create temporary TLS path buf of size NT_MAX_PATH. */
|
||||
PWCHAR w_get (); /* Create temporary TLS path buf of size 2 * NT_MAX_PATH. */
|
||||
inline char *t_get () { return (char *) w_get (); }
|
||||
|
Reference in New Issue
Block a user