Skip to content

Commit d22b68b

Browse files
authored
Merge pull request #526 from jyn514/panic-source
Fix panics when viewing source of failed build (redux)
2 parents 1ae73e9 + 9f35100 commit d22b68b

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

src/web/source.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ impl FileList {
104104
return None;
105105
}
106106

107-
let files: Json = rows.get(0).get(5);
107+
let files: Json = rows.get(0).get_opt(5).unwrap().ok()?;
108108

109109
let mut file_list: Vec<File> = Vec::new();
110110

@@ -234,6 +234,11 @@ pub fn source_browser_handler(req: &mut Request) -> IronResult<Response> {
234234
};
235235

236236
let list = FileList::from_path(&conn, &name, &version, &req_path);
237+
if list.is_none() {
238+
use iron::status;
239+
use super::error::Nope;
240+
return Err(IronError::new(Nope::NoResults, status::NotFound));
241+
}
237242

238243
let page = Page::new(list)
239244
.set_bool("show_parent_link", !req_path.is_empty())

0 commit comments

Comments
 (0)