hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-16 16:53:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Prevent a panic on generated labels

Browse Source
This commit is contained in:
Arthur Baars
2024-09-07 23:15:33 +02:00
parent 6e6942b1d7
commit 6acc107021
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rust/extractor/src/translate.rs
View File

@@ -9,7 +9,7 @@ use ra_ap_hir::{Crate, Module, ModuleDef};
use ra_ap_hir_def::body::{Body, BodySourceMap};
use ra_ap_hir_def::hir::{CaptureBy, ExprId, LabelId, MatchArm, PatId, Statement};
use ra_ap_ide_db::line_index::LineIndex;
use ra_ap_ide_db::{LineIndexDatabase, RootDatabase};
use ra_ap_ide_db::{label, LineIndexDatabase, RootDatabase};
use ra_ap_syntax::ast::RangeOp;
use ra_ap_syntax::{AstNode, Edition};
use ra_ap_vfs::{FileId, Vfs};
@@ -137,8 +137,9 @@ impl CrateTranslator<'_> {
label_id: ra_ap_hir_def::hir::LabelId,
source_map: &BodySourceMap,
) -> Option<trap::Label> {
let source = source_map.label_syntax(label_id);
self.emit_location_ast_ptr(source)
// 'catch' a panic if the source map is incomplete
let source = std::panic::catch_unwind(|| source_map.label_syntax(label_id)).ok();
source.and_then(|source| self.emit_location_ast_ptr(source))
}
fn emit_location<T: HasSource>(&mut self, entity: T) -> Option<trap::Label>
where