Parcourir la source

library: fix race conditional crash which could be triggered by uploading > 20 small files with parseable meta data

Felix Paul Kühne il y a 11 ans
Parent
commit
8ccd71ed12
2 fichiers modifiés avec 10 ajouts et 6 suppressions
  1. 5 3
      Sources/VLCPlaylistCollectionViewCell.m
  2. 5 3
      Sources/VLCPlaylistTableViewCell.m

+ 5 - 3
Sources/VLCPlaylistCollectionViewCell.m

@@ -260,11 +260,13 @@
     NSUInteger count = album.tracks.count;
     NSMutableString *string = [[NSMutableString alloc] init];
     if (anyTrack) {
-        [string appendString:anyTrack.artist];
-        [string appendString:@" — "];
+        if (anyTrack.artist.length > 0) {
+            [string appendString:anyTrack.artist];
+            [string appendString:@" — "];
+        }
     }
     [string appendString:[NSString stringWithFormat:(count > 1) ? NSLocalizedString(@"LIBRARY_TRACKS", @"") : NSLocalizedString(@"LIBRARY_SINGLE_TRACK", @""), count]];
-    if (album.releaseYear)
+    if (album.releaseYear.length > 0)
         [string appendFormat:@" — %@", album.releaseYear];
     self.subtitleLabel.text = string;
     self.mediaIsUnreadView.hidden = YES;

+ 5 - 3
Sources/VLCPlaylistTableViewCell.m

@@ -244,11 +244,13 @@
     NSUInteger count = album.tracks.count;
     NSMutableString *string = [[NSMutableString alloc] init];
     if (anyTrack) {
-        [string appendString:anyTrack.artist];
-        [string appendString:@" — "];
+        if (anyTrack.artist.length > 0) {
+            [string appendString:anyTrack.artist];
+            [string appendString:@" — "];
+        }
     }
     [string appendString:[NSString stringWithFormat:(count > 1) ? NSLocalizedString(@"LIBRARY_TRACKS", @"") : NSLocalizedString(@"LIBRARY_SINGLE_TRACK", @""), count]];
-    if (album.releaseYear)
+    if (album.releaseYear.length > 0)
         [string appendFormat:@" — %@", album.releaseYear];
     self.subtitleLabel.text = string;
     self.mediaIsUnreadView.hidden = YES;