ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kernel32: Overhaul the handling of argv in set_process_name(). 

This fixes several problems with the code:

* The code had been assuming that the argument strings pointed to by the argv
  array are contiguous iff certain process-name-setting functions are available.
  This doesn't seem reliable.  Instead, test if it's true and shift the strings
  if so.

  However, setproctitle() is specifically documented as a preferred alternative
  to the technique of overwriting the arg strings, so don't shift the strings
  if that's available.

* Use the last path component, recognizing backslash as a path separator, for
  setprogname() in addition to prctl().  First, setprogname() is documented as
  searching for the last component itself, but it doesn't understand Windows-
  style paths, so we need to help it.  Second, on some platforms (e.g. macOS),
  setprogname(), like prctl(), has a fairly small internal length limit (e.g.
  32 characters).  So, concentrate on the most meaningful part of the path.

* Remove argv[0] from argv whether or not there are any process-name-setting
  functions available.  This is necessary for the proper functioning of Wine,
  so it must be done on all platforms.  This part of the logic was lost with
  commit 5a4576ee0.

* Call all available process-name-setting functions instead of treating them
  as mutually exclusive alternatives.  This is also logic that was lost with
  commit 5a4576ee0.

Signed-off-by: Ken Thomases <ken@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Ken Thomases 2016-07-11 23:44:20 -05:00 committed by Alexandre Julliard
parent 789c4c45ce
commit a73045d6a0
1 changed files with 37 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
dlls/kernel32/process.c
View File

@ -1116,39 +1116,36 @@ static DWORD WINAPI start_process( PEB *peb )
*/ */
static void set_process_name( int argc, char *argv[] ) static void set_process_name( int argc, char *argv[] )
{ {
BOOL shift_strings;
char *p, *name;
int i;
#ifdef HAVE_SETPROCTITLE #ifdef HAVE_SETPROCTITLE
setproctitle("-%s", argv[1]); setproctitle("-%s", argv[1]);
/* remove argv[0] */ shift_strings = FALSE;
memmove( argv, argv + 1, argc * sizeof(argv[0]) ); #else
#elif defined(HAVE_SETPROGNAME) p = argv[0];
int i, offset;
char *end = argv[argc-1] + strlen(argv[argc-1]) + 1;
offset = argv[1] - argv[0]; shift_strings = (argc >= 2);
memmove( argv[1] - offset, argv[1], end - argv[1] ); for (i = 1; i < argc; i++)
memset( end - offset, 0, offset ); {
for (i = 1; i < argc; i++) argv[i-1] = argv[i] - offset; p += strlen(p) + 1;
argv[i-1] = NULL; if (p != argv[i])
{
setprogname( argv[0] ); shift_strings = FALSE;
#elif defined(HAVE_PRCTL) break;
int i, offset; }
char *p, *prctl_name = argv[1]; }
char *end = argv[argc-1] + strlen(argv[argc-1]) + 1;
#ifndef PR_SET_NAME
# define PR_SET_NAME 15
#endif #endif
if ((p = strrchr( prctl_name, '\\' ))) prctl_name = p + 1; if (shift_strings)
if ((p = strrchr( prctl_name, '/' ))) prctl_name = p + 1;
if (prctl( PR_SET_NAME, prctl_name ) != -1)
{ {
offset = argv[1] - argv[0]; int offset = argv[1] - argv[0];
memmove( argv[1] - offset, argv[1], end - argv[1] ); char *end = argv[argc-1] + strlen(argv[argc-1]) + 1;
memmove( argv[0], argv[1], end - argv[1] );
memset( end - offset, 0, offset ); memset( end - offset, 0, offset );
for (i = 1; i < argc; i++) argv[i-1] = argv[i] - offset; for (i = 1; i < argc; i++)
argv[i-1] = argv[i] - offset;
argv[i-1] = NULL; argv[i-1] = NULL;
} }
else else
@ -1156,6 +1153,20 @@ static void set_process_name( int argc, char *argv[] )
/* remove argv[0] */ /* remove argv[0] */
memmove( argv, argv + 1, argc * sizeof(argv[0]) ); memmove( argv, argv + 1, argc * sizeof(argv[0]) );
} }
name = argv[0];
if ((p = strrchr( name, '\\' ))) name = p + 1;
if ((p = strrchr( name, '/' ))) name = p + 1;
#if defined(HAVE_SETPROGNAME)
setprogname( name );
#endif
#ifdef HAVE_PRCTL
#ifndef PR_SET_NAME
# define PR_SET_NAME 15
#endif
prctl( PR_SET_NAME, name );
#endif /* HAVE_PRCTL */ #endif /* HAVE_PRCTL */
} }