diff options
| author | Thomas E. Dickey <dickey@invisible-island.net> | 2019-01-03 02:10:17 +0000 |
|---|---|---|
| committer | Thomas E. Dickey <dickey@invisible-island.net> | 2019-01-03 02:10:17 +0000 |
| commit | 567157ae3b72d6fdccd659a9bcadd2bb505cb28f (patch) | |
| tree | 9db228704ba4a7f0e3359e7ab7f32e294caa9fbf /WWW/Library/Implementation | |
| parent | a45e2ee8f04e0b8424ad185dcf81ec8fa884cc91 (diff) | |
| download | lynx-snapshots-567157ae3b72d6fdccd659a9bcadd2bb505cb28f.tar.gz | |
snapshot of project "lynx", label v2-9-0dev_0i
Diffstat (limited to 'WWW/Library/Implementation')
| -rw-r--r-- | WWW/Library/Implementation/HTFormat.c | 6 | ||||
| -rw-r--r-- | WWW/Library/Implementation/SGML.c | 7 |
2 files changed, 8 insertions, 5 deletions
diff --git a/WWW/Library/Implementation/HTFormat.c b/WWW/Library/Implementation/HTFormat.c index 46e38113..c4e4f4a6 100644 --- a/WWW/Library/Implementation/HTFormat.c +++ b/WWW/Library/Implementation/HTFormat.c @@ -1,5 +1,5 @@ /* - * $LynxId: HTFormat.c,v 1.90 2018/05/11 22:18:24 tom Exp $ + * $LynxId: HTFormat.c,v 1.91 2019/01/02 23:25:10 tom Exp $ * * Manage different file formats HTFormat.c * ============================= @@ -347,7 +347,9 @@ static int half_match(char *trial_type, char *target) */ static BOOL failsMailcap(HTPresentation *pres, HTParentAnchor *anchor) { - if (pres->testcommand != 0) { + if (pres->testcommand != NULL && + anchor != NULL && + anchor->content_type_params != NULL) { if (LYTestMailcapCommand(pres->testcommand, anchor->content_type_params) != 0) return TRUE; diff --git a/WWW/Library/Implementation/SGML.c b/WWW/Library/Implementation/SGML.c index f9c2c8bc..6f0ebc26 100644 --- a/WWW/Library/Implementation/SGML.c +++ b/WWW/Library/Implementation/SGML.c @@ -1,5 +1,5 @@ /* - * $LynxId: SGML.c,v 1.165 2018/12/29 00:50:51 tom Exp $ + * $LynxId: SGML.c,v 1.167 2019/01/02 21:06:28 tom Exp $ * * General SGML Parser code SGML.c * ======================== @@ -108,7 +108,6 @@ BOOL HTPassHighCtrlNum = FALSE; /* Pass €-Ÿ raw. */ /* The State (context) of the parser * * This is passed with each call to make the parser reentrant - * */ #define MAX_ATTRIBUTES 36 /* Max number of attributes per element */ @@ -1666,6 +1665,7 @@ static void SGML_character(HTStream *me, int c_in) /* * If we want the raw input converted to Unicode, try that now. - FM */ +#ifdef EXP_JAPANESEUTF8_SUPPORT /* Convert ISO-2022-JP to Unicode (charset=iso-2022-jp is unrecognized) */ #define IS_JIS7_HILO(c) (0x20<(c)&&(c)<0x7F) if (UTF8_TTY_ISO2022JP && (me->state == S_nonascii_text @@ -1698,6 +1698,7 @@ static void SGML_character(HTStream *me, int c_in) } goto top1; } +#endif /* EXP_JAPANESEUTF8_SUPPORT */ if (me->T.trans_to_uni && #ifdef EXP_JAPANESEUTF8_SUPPORT ((strcmp(LYCharSet_UC[me->inUCLYhndl].MIMEname, "euc-jp") == 0) || @@ -1743,7 +1744,7 @@ static void SGML_character(HTStream *me, int c_in) } goto top1; } else if (me->T.trans_to_uni && -#endif +#endif /* EXP_JAPANESEUTF8_SUPPORT */ /* S/390 -- gil -- 0744 */ ((TOASCII(clong) >= LYlowest_eightbit[me->inUCLYhndl]) || (clong < ' ' && clong != 0 && |