alex/yomichan
1
Fork 0
Code Releases Activity

Validate bounds of Display.definitions before using

Browse Source
This commit is contained in:
toasted-nutbread 2020-02-13 20:42:25 -05:00
parent db1da33321
commit 483f7401b7
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ext/mixed/js/display.js
View File

@ -179,13 +179,15 @@ class Display {
e.preventDefault(); e.preventDefault();
const link = e.currentTarget; const link = e.currentTarget;
const entry = link.closest('.entry'); const entry = link.closest('.entry');
const definitionIndex = this.entryIndexFind(entry); const index = this.entryIndexFind(entry);
if (index < 0 || index >= this.definitions.length) { return; }
const expressionIndex = Display.indexOf(entry.querySelectorAll('.term-expression .action-play-audio'), link); const expressionIndex = Display.indexOf(entry.querySelectorAll('.term-expression .action-play-audio'), link);
this.audioPlay( this.audioPlay(
this.definitions[definitionIndex], this.definitions[index],
// expressionIndex is used in audioPlay to detect result output mode // expressionIndex is used in audioPlay to detect result output mode
Math.max(expressionIndex, this.options.general.resultOutputMode === 'merge' ? 0 : -1), Math.max(expressionIndex, this.options.general.resultOutputMode === 'merge' ? 0 : -1),
definitionIndex index
); );
} }
@ -193,6 +195,8 @@ class Display {
e.preventDefault(); e.preventDefault();
const link = e.currentTarget; const link = e.currentTarget;
const index = this.entryIndexFind(link); const index = this.entryIndexFind(link);
if (index < 0 || index >= this.definitions.length) { return; }
this.noteAdd(this.definitions[index], link.dataset.mode); this.noteAdd(this.definitions[index], link.dataset.mode);
} }
@ -512,6 +516,8 @@ class Display {
} }
autoPlayAudio() { autoPlayAudio() {
if (this.definitions.length === 0) { return; }
this.audioPlay(this.definitions[0], this.firstExpressionIndex, 0); this.audioPlay(this.definitions[0], this.firstExpressionIndex, 0);
} }
@ -611,9 +617,12 @@ class Display {
} }
noteTryAdd(mode) { noteTryAdd(mode) {
const button = this.adderButtonFind(this.index, mode); const index = this.index;
if (index < 0 || index >= this.definitions.length) { return; }
const button = this.adderButtonFind(index, mode);
if (button !== null && !button.classList.contains('disabled')) { if (button !== null && !button.classList.contains('disabled')) {
this.noteAdd(this.definitions[this.index], mode); this.noteAdd(this.definitions[index], mode);
} }
} }
@ -915,9 +924,12 @@ Display._onKeyDownHandlers = new Map([
['P', (self, e) => { ['P', (self, e) => {
if (e.altKey) { if (e.altKey) {
const entry = self.getEntry(self.index); const index = self.index;
if (index < 0 || index >= self.definitions.length) { return; }
const entry = self.getEntry(index);
if (entry !== null && entry.dataset.type === 'term') { if (entry !== null && entry.dataset.type === 'term') {
self.audioPlay(self.definitions[self.index], self.firstExpressionIndex, self.index); self.audioPlay(self.definitions[index], self.firstExpressionIndex, index);
} }
return true; return true;
} }