JavaScript: avoid assertion failures when making an empty tag

Related to #900, #1112, and #3427. When the parser tries making a tag with empty name, an assertion in registerEntry fails. The parser side should be fixed but it will take a time. This change puts guard conditions around registerEntry to avoid the failures. THIS IS A TEMPORARILY SOLUTION. Signed-off-by: Masatake YAMATO <[email protected]>
universal-ctags · Jul 5, 2022 · cf68aae · cf68aae
1 parent b6ac374
commit cf68aae
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/Units/parser-javascript.r/tagging-empty-name.d/README b/Units/parser-javascript.r/tagging-empty-name.d/README
@@ -0,0 +1,2 @@
+This is a crash test.
+See #900, #1112, and #3427.
diff --git a/Units/parser-javascript.r/tagging-empty-name.d/input.js b/Units/parser-javascript.r/tagging-empty-name.d/input.js
@@ -0,0 +1 @@
+const
diff --git a/parsers/jscript.c b/parsers/jscript.c
@@ -474,7 +474,11 @@ static int makeJsRefTagsForNameChain (char *name_chain, const tokenInfo *token,
 		e.extensionFields.scopeIndex = scope;
 
 		index = makeTagEntry (&e);
-		registerEntry (index);
+		/* We shold remove This condition. We should fix the callers passing
+		 * an empty name instead. makeTagEntry() returns CORK_NIL if the tag
+		 * name is empty. */
+		if (index != CORK_NIL)
+			registerEntry (index);
 	}
 
 	return next
@@ -556,7 +560,11 @@ static int makeJsTagCommon (const tokenInfo *const token, const jsKind kind,
 		markTagExtraBit (&e, XTAG_ANONYMOUS);
 
 	index = makeTagEntry (&e);
-	registerEntry (index);
+	/* We shold remove This condition. We should fix the callers passing
+	 * an empty name instead. makeTagEntry() returns CORK_NIL if the tag
+	 * name is empty. */
+	if (index != CORK_NIL)
+		registerEntry (index);
 
 	return index;
 }