Patchwork D6866: osutil: tolerate Py_GetArgcArgv not being set up properly

login
register
mail settings
Submitter phabricator
Date Sept. 23, 2019, 5:15 p.m.
Message ID <46144dd161ebe31dcc4bafd69a4922d5@localhost.localdomain>
Download mbox | patch
Permalink /patch/41737/
State Not Applicable
Headers show

Comments

phabricator - Sept. 23, 2019, 5:15 p.m.
Closed by commit rHGd6227c6c0814: osutil: tolerate Py_GetArgcArgv not being set up properly (authored by spectral).
This revision was automatically updated to reflect the committed changes.
This revision was not accepted when it landed; it landed in state "Needs Review".

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D6866?vs=16577&id=16591

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6866/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6866

AFFECTED FILES
  mercurial/cext/osutil.c

CHANGE DETAILS




To: spectral, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/mercurial/cext/osutil.c b/mercurial/cext/osutil.c
--- a/mercurial/cext/osutil.c
+++ b/mercurial/cext/osutil.c
@@ -798,10 +798,17 @@ 
 			char *argvend;
 			extern void Py_GetArgcArgv(int *argc, char ***argv);
 			Py_GetArgcArgv(&argc, &argv);
+			/* Py_GetArgcArgv may not do much if a custom python
+			 * launcher is used that doesn't record the information
+			 * it needs. Let's handle this gracefully instead of
+			 * segfaulting. */
+			if (argv != NULL)
+				argvend = argvstart = argv[0];
+			else
+				argvend = argvstart = NULL;
 
 			/* Check the memory we can use. Typically, argv[i] and
 			 * argv[i + 1] are continuous. */
-			argvend = argvstart = argv[0];
 			for (i = 0; i < argc; ++i) {
 				if (argv[i] > argvend || argv[i] < argvstart)
 					break; /* not continuous */