head 1.1; access; symbols pkgsrc-2026Q1:1.1.0.92 pkgsrc-2026Q1-base:1.1 pkgsrc-2025Q4:1.1.0.90 pkgsrc-2025Q4-base:1.1 pkgsrc-2025Q3:1.1.0.88 pkgsrc-2025Q3-base:1.1 pkgsrc-2025Q2:1.1.0.86 pkgsrc-2025Q2-base:1.1 pkgsrc-2025Q1:1.1.0.84 pkgsrc-2025Q1-base:1.1 pkgsrc-2024Q4:1.1.0.82 pkgsrc-2024Q4-base:1.1 pkgsrc-2024Q3:1.1.0.80 pkgsrc-2024Q3-base:1.1 pkgsrc-2024Q2:1.1.0.78 pkgsrc-2024Q2-base:1.1 pkgsrc-2024Q1:1.1.0.76 pkgsrc-2024Q1-base:1.1 pkgsrc-2023Q4:1.1.0.74 pkgsrc-2023Q4-base:1.1 pkgsrc-2023Q3:1.1.0.72 pkgsrc-2023Q3-base:1.1 pkgsrc-2023Q2:1.1.0.70 pkgsrc-2023Q2-base:1.1 pkgsrc-2023Q1:1.1.0.68 pkgsrc-2023Q1-base:1.1 pkgsrc-2022Q4:1.1.0.66 pkgsrc-2022Q4-base:1.1 pkgsrc-2022Q3:1.1.0.64 pkgsrc-2022Q3-base:1.1 pkgsrc-2022Q2:1.1.0.62 pkgsrc-2022Q2-base:1.1 pkgsrc-2022Q1:1.1.0.60 pkgsrc-2022Q1-base:1.1 pkgsrc-2021Q4:1.1.0.58 pkgsrc-2021Q4-base:1.1 pkgsrc-2021Q3:1.1.0.56 pkgsrc-2021Q3-base:1.1 pkgsrc-2021Q2:1.1.0.54 pkgsrc-2021Q2-base:1.1 pkgsrc-2021Q1:1.1.0.52 pkgsrc-2021Q1-base:1.1 pkgsrc-2020Q4:1.1.0.50 pkgsrc-2020Q4-base:1.1 pkgsrc-2020Q3:1.1.0.48 pkgsrc-2020Q3-base:1.1 pkgsrc-2020Q2:1.1.0.44 pkgsrc-2020Q2-base:1.1 pkgsrc-2020Q1:1.1.0.24 pkgsrc-2020Q1-base:1.1 pkgsrc-2019Q4:1.1.0.46 pkgsrc-2019Q4-base:1.1 pkgsrc-2019Q3:1.1.0.42 pkgsrc-2019Q3-base:1.1 pkgsrc-2019Q2:1.1.0.40 pkgsrc-2019Q2-base:1.1 pkgsrc-2019Q1:1.1.0.38 pkgsrc-2019Q1-base:1.1 pkgsrc-2018Q4:1.1.0.36 pkgsrc-2018Q4-base:1.1 pkgsrc-2018Q3:1.1.0.34 pkgsrc-2018Q3-base:1.1 pkgsrc-2018Q2:1.1.0.32 pkgsrc-2018Q2-base:1.1 pkgsrc-2018Q1:1.1.0.30 pkgsrc-2018Q1-base:1.1 pkgsrc-2017Q4:1.1.0.28 pkgsrc-2017Q4-base:1.1 pkgsrc-2017Q3:1.1.0.26 pkgsrc-2017Q3-base:1.1 pkgsrc-2017Q2:1.1.0.22 pkgsrc-2017Q2-base:1.1 pkgsrc-2017Q1:1.1.0.20 pkgsrc-2017Q1-base:1.1 pkgsrc-2016Q4:1.1.0.18 pkgsrc-2016Q4-base:1.1 pkgsrc-2016Q3:1.1.0.16 pkgsrc-2016Q3-base:1.1 pkgsrc-2016Q2:1.1.0.14 pkgsrc-2016Q2-base:1.1 pkgsrc-2016Q1:1.1.0.12 pkgsrc-2016Q1-base:1.1 pkgsrc-2015Q4:1.1.0.10 pkgsrc-2015Q4-base:1.1 pkgsrc-2015Q3:1.1.0.8 pkgsrc-2015Q3-base:1.1 pkgsrc-2015Q2:1.1.0.6 pkgsrc-2015Q2-base:1.1 pkgsrc-2015Q1:1.1.0.4 pkgsrc-2015Q1-base:1.1 pkgsrc-2014Q4:1.1.0.2; locks; strict; comment @# @; 1.1 date 2015.03.29.09.19.06; author bsiegert; state Exp; branches 1.1.2.1; next ; commitid O0XUmSaW0rTVYtfy; 1.1.2.1 date 2015.03.29.09.19.06; author hiramatsu; state dead; branches; next 1.1.2.2; commitid 62U9PNxhYCBArVfy; 1.1.2.2 date 2015.04.01.20.01.59; author hiramatsu; state Exp; branches; next ; commitid 62U9PNxhYCBArVfy; desc @@ 1.1 log @SECURITY: Fix CVE-2014-7204 (DoS in JavaScript parser) in exuberant-ctags. @ text @$NetBSD$ http://sourceforge.net/p/ctags/code/791/ Fix denial of service that results from attempting to run ctags over large volumes of public source code. --- jscript.c +++ jscript.c @@@@ -215,6 +215,7 @@@@ * Tag generation functions */ +/* static void makeConstTag (tokenInfo *const token, const jsKind kind) { if (JsKinds [kind].enabled && ! token->ignoreTag ) @@@@ -238,12 +239,13 @@@@ if (JsKinds [kind].enabled && ! token->ignoreTag ) { - /* + * * If a scope has been added to the token, change the token * string to include the scope when making the tag. - */ + * if ( vStringLength(token->scope) > 0 ) { + * fulltag = vStringNew (); vStringCopy(fulltag, token->scope); vStringCatS (fulltag, "."); @@@@ -251,8 +253,54 @@@@ vStringTerminate(fulltag); vStringCopy(token->string, fulltag); vStringDelete (fulltag); - } - makeConstTag (token, kind); + * + jsKind parent_kind = JSTAG_CLASS; + + * + * if we're creating a function (and not a method), + * guess we're inside another function + * + if (kind == JSTAG_FUNCTION) + parent_kind = JSTAG_FUNCTION; + + e.extensionFields.scope[0] = JsKinds [parent_kind].name; + e.extensionFields.scope[1] = vStringValue (token->scope); + } + * makeConstTag (token, kind); * + makeTagEntry (&e); + } +} +*/ + +static void makeJsTag (tokenInfo *const token, const jsKind kind) +{ + if (JsKinds [kind].enabled && ! token->ignoreTag ) + { + const char *const name = vStringValue (token->string); + tagEntryInfo e; + initTagEntry (&e, name); + + e.lineNumber = token->lineNumber; + e.filePosition = token->filePosition; + e.kindName = JsKinds [kind].name; + e.kind = JsKinds [kind].letter; + + if ( vStringLength(token->scope) > 0 ) + { + jsKind parent_kind = JSTAG_CLASS; + + /* + * If we're creating a function (and not a method), + * guess we're inside another function + */ + if (kind == JSTAG_FUNCTION) + parent_kind = JSTAG_FUNCTION; + + e.extensionFields.scope[0] = JsKinds [parent_kind].name; + e.extensionFields.scope[1] = vStringValue (token->scope); + } + + makeTagEntry (&e); } } @ 1.1.2.1 log @file patch-CVE-2014-7204 was added on branch pkgsrc-2014Q4 on 2015-04-01 20:01:59 +0000 @ text @d1 88 @ 1.1.2.2 log @Pullup ticket #4652 - requested by bsiegert devel/exctags: security patch Revisions pulled up: - devel/exctags/Makefile 1.27 - devel/exctags/distinfo 1.13 - devel/exctags/patches/patch-CVE-2014-7204 1.1 --- Module Name: pkgsrc Committed By: bsiegert Date: Sun Mar 29 09:19:06 UTC 2015 Modified Files: pkgsrc/devel/exctags: Makefile distinfo Added Files: pkgsrc/devel/exctags/patches: patch-CVE-2014-7204 Log Message: SECURITY: Fix CVE-2014-7204 (DoS in JavaScript parser) in exuberant-ctags. @ text @a0 88 $NetBSD: patch-CVE-2014-7204,v 1.1 2015/03/29 09:19:06 bsiegert Exp $ http://sourceforge.net/p/ctags/code/791/ Fix denial of service that results from attempting to run ctags over large volumes of public source code. --- jscript.c +++ jscript.c @@@@ -215,6 +215,7 @@@@ * Tag generation functions */ +/* static void makeConstTag (tokenInfo *const token, const jsKind kind) { if (JsKinds [kind].enabled && ! token->ignoreTag ) @@@@ -238,12 +239,13 @@@@ if (JsKinds [kind].enabled && ! token->ignoreTag ) { - /* + * * If a scope has been added to the token, change the token * string to include the scope when making the tag. - */ + * if ( vStringLength(token->scope) > 0 ) { + * fulltag = vStringNew (); vStringCopy(fulltag, token->scope); vStringCatS (fulltag, "."); @@@@ -251,8 +253,54 @@@@ vStringTerminate(fulltag); vStringCopy(token->string, fulltag); vStringDelete (fulltag); - } - makeConstTag (token, kind); + * + jsKind parent_kind = JSTAG_CLASS; + + * + * if we're creating a function (and not a method), + * guess we're inside another function + * + if (kind == JSTAG_FUNCTION) + parent_kind = JSTAG_FUNCTION; + + e.extensionFields.scope[0] = JsKinds [parent_kind].name; + e.extensionFields.scope[1] = vStringValue (token->scope); + } + * makeConstTag (token, kind); * + makeTagEntry (&e); + } +} +*/ + +static void makeJsTag (tokenInfo *const token, const jsKind kind) +{ + if (JsKinds [kind].enabled && ! token->ignoreTag ) + { + const char *const name = vStringValue (token->string); + tagEntryInfo e; + initTagEntry (&e, name); + + e.lineNumber = token->lineNumber; + e.filePosition = token->filePosition; + e.kindName = JsKinds [kind].name; + e.kind = JsKinds [kind].letter; + + if ( vStringLength(token->scope) > 0 ) + { + jsKind parent_kind = JSTAG_CLASS; + + /* + * If we're creating a function (and not a method), + * guess we're inside another function + */ + if (kind == JSTAG_FUNCTION) + parent_kind = JSTAG_FUNCTION; + + e.extensionFields.scope[0] = JsKinds [parent_kind].name; + e.extensionFields.scope[1] = vStringValue (token->scope); + } + + makeTagEntry (&e); } } @