diff options
| author | Eduardo Chappa <chappa@washington.edu> | 2021-11-05 15:13:43 -0600 |
|---|---|---|
| committer | Eduardo Chappa <chappa@washington.edu> | 2021-11-05 15:13:43 -0600 |
| commit | 216ad987323d8984de2dd9cccdf200a8f801d740 (patch) | |
| tree | c981ce6f5abbc29ee679f1c77edd6f3b0ce87cd0 | |
| parent | a0159a2dc04389a62d81f39d91f76cfab6b7293c (diff) | |
| download | alpine-216ad987323d8984de2dd9cccdf200a8f801d740.tar.xz | |
* Crash when invoking Alpine from the command line and an attempt to authorize
alpine to use XOAUTH2 is done. Alpine crashes because of a missing optional
parameter -xoauth2-flow and because no screen has been configured yet. Reported
by Baron Fujimoto.
| -rw-r--r-- | alpine/confscroll.c | 2 | ||||
| -rw-r--r-- | alpine/xoauth2conf.c | 2 | ||||
| -rw-r--r-- | pith/pine.hlp | 7 |
3 files changed, 8 insertions, 3 deletions
diff --git a/alpine/confscroll.c b/alpine/confscroll.c index ef0a2dd9..8bfb533d 100644 --- a/alpine/confscroll.c +++ b/alpine/confscroll.c @@ -6010,7 +6010,7 @@ delete_user_vals(struct variable *v) int unexpected_pinerc_change(void) { - Writechar(BELL, 0); + if(ps_global->ttyo) Writechar(BELL, 0); if(want_to("Unexpected pinerc change! Overwrite with current config", 'n', 0, NO_HELP, WT_FLUSH_IN) == 'n'){ return(-1); /* abort pinerc write */ diff --git a/alpine/xoauth2conf.c b/alpine/xoauth2conf.c index fa4c1ddf..7d5b72b8 100644 --- a/alpine/xoauth2conf.c +++ b/alpine/xoauth2conf.c @@ -198,7 +198,7 @@ xoauth_info_choice(XOAUTH2_INFO_S **xinfo, char *user) char reply[1024]; int sel; for(i = n = 0; xinfo[i] != NULL; i++) - n += strlen(xinfo[i]->client_id) + strlen(xinfo[i]->flow) + n += strlen(xinfo[i]->client_id) + strlen(xinfo[i]->flow ? xinfo[i]->flow : "") + strlen(xinfo[i]->users ? xinfo[i]->users : "") + 8; /* number, parenthesis, space */ n += strlen((char *) xinfo[0]->name) + strlen(user); n += 1024; /* large enough to display lines of 80 characters in UTF-8 */ diff --git a/pith/pine.hlp b/pith/pine.hlp index 507ba91b..1377d3c9 100644 --- a/pith/pine.hlp +++ b/pith/pine.hlp @@ -140,7 +140,7 @@ with help text for the config screen and the composer that didn't have any reasonable place to be called from. Dummy change to get revision in pine.hlp ============= h_revision ================= -Alpine Commit 611 2021-11-01 20:42:01 +Alpine Commit 612 2021-11-05 15:13:25 ============= h_news ================= <HTML> <HEAD> @@ -219,6 +219,11 @@ new additions to Alpine, please check it periodically. Bugs addressed include: <UL> +<LI> Crash when invoking Alpine from the command line and an attempt to authorize + alpine to use XOAUTH2 is done. Alpine crashes because of a missing optional + parameter -xoauth2-flow and because no screen has been configured yet. Reported + by Baron Fujimoto. + <LI> Alpine crashes when it cannot retrieve the privacy policy due to failure connecting to the external server. |