Skip to content

Commit 9caa881

Browse files
Add upload records bounds check
1 parent fa15e5a commit 9caa881

1 file changed

Lines changed: 6 additions & 4 deletions

File tree

AppBox/ViewController/DashboardViewController/DashboardViewController.m

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,9 @@ -(NSInteger)numberOfRowsInTableView:(NSTableView *)tableView{
110110
}
111111

112112
-(NSView *)tableView:(NSTableView *)tableView viewForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row{
113+
if (row < 0 || row >= (NSInteger)uploadRecords.count) {
114+
return nil;
115+
}
113116
ABUploadRecord *uploadRecord = [uploadRecords objectAtIndex:row];
114117
NSTableCellView *cell = [tableView makeViewWithIdentifier:ShortURLCellId owner:nil];
115118

@@ -242,7 +245,6 @@ - (IBAction)showQRCodeButtonTapped:(NSButton *)sender {
242245
- (IBAction)showInFinderButtonTapped:(NSButton *)sender {
243246
ABUploadRecord *uploadRecord = [self selectedUploadRecord];
244247
if (uploadRecord){
245-
ABUploadRecord *uploadRecord = [uploadRecords objectAtIndex:_dashboardTableView.selectedRow];
246248
BOOL isDirectory = NO;
247249
if ([[NSFileManager defaultManager] fileExistsAtPath:uploadRecord.localBuildPath isDirectory:&isDirectory]) {
248250
NSURL *fileURL = [NSURL fileURLWithPath:uploadRecord.localBuildPath];
@@ -264,11 +266,11 @@ - (IBAction)showInDropBoxButtonTapped:(NSButton *)sender {
264266

265267
//MARK: - Helper Method
266268
-(ABUploadRecord *)selectedUploadRecord{
267-
if (_dashboardTableView.selectedRow == -1 || uploadRecords == nil || (uploadRecords && uploadRecords.count == 0)){
269+
NSInteger selectedRow = _dashboardTableView.selectedRow;
270+
if (selectedRow < 0 || uploadRecords == nil || selectedRow >= (NSInteger)uploadRecords.count){
268271
return nil;
269272
}
270-
ABUploadRecord *uploadRecord = [uploadRecords objectAtIndex:_dashboardTableView.selectedRow];
271-
return uploadRecord;
273+
return [uploadRecords objectAtIndex:selectedRow];
272274
}
273275

274276
@end

0 commit comments

Comments
 (0)