Changeset 153945 in webkit
- Timestamp:
- Aug 12, 2013 9:49:56 AM (11 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r153944 r153945 1 2013-08-12 peavo@outlook.com <peavo@outlook.com> 2 3 [Curl] Crash when starting second download. 4 https://bugs.webkit.org/show_bug.cgi?id=119620 5 6 Reviewed by Brent Fulgham. 7 8 When a second download is started, a crash sometimes occurs in Curl. 9 This happens because the Curl easy handle is deleted and removed from the Curl multi handle twice. 10 This is solved by adding an array to keep track of active downloads to avoid double deletion. 11 12 * platform/network/curl/CurlDownload.cpp: 13 (WebCore::CurlDownloadManager::CurlDownloadManager): Removed active download count member. 14 (WebCore::CurlDownloadManager::getActiveDownloadCount): Use active download array to return active download count. 15 (WebCore::CurlDownloadManager::updateHandleList): Remove Curl handles before adding, in case Curl reuses handles. 16 (WebCore::CurlDownloadManager::addToCurl): Add Curl handle to active download array. 17 (WebCore::CurlDownloadManager::removeFromCurl): Check if Curl handle is in active download array to avoid double deletion. 18 (WebCore::CurlDownloadManager::downloadThread): Removed active download count member. 19 * platform/network/curl/CurlDownload.h: Added array of active downloads member, and removed download count member. 1 2013-08-12 Eric Carlson <eric.carlson@apple.com> 2 3 Revert r153912 because it broke some track tests. 4 5 Rubber-stamped by Antti Koivisto. 6 7 * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm: 8 (WebCore::MediaPlayerPrivateAVFoundationObjC::tracksChanged): 9 (WebCore::MediaPlayerPrivateAVFoundationObjC::languageOfPrimaryAudioTrack): 20 10 21 11 2013-08-12 Antti Koivisto <antti@apple.com> -
trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
r153912 r153945 1046 1046 sizeChanged(); 1047 1047 1048 if ( primaryAudioTrackLanguage != languageOfPrimaryAudioTrack())1048 if (!primaryAudioTrackLanguage.isNull() && primaryAudioTrackLanguage != languageOfPrimaryAudioTrack()) 1049 1049 player()->characteristicChanged(); 1050 1050 } … … 1497 1497 AVAssetTrack *track = [tracks objectAtIndex:0]; 1498 1498 NSString *language = [track extendedLanguageTag]; 1499 1500 // If the language code is stored as a QuickTime 5-bit packed code there aren't enough bits for a full1501 // RFC 4646 language tag so extendedLanguageTag returns NULL. In this case languageCode will return the1502 // ISO 639-2/T language code so check it.1503 if (!language)1504 language = [track languageCode];1505 1499 1506 1500 // Some legacy tracks have "und" as a language, treat that the same as no language at all.
Note: See TracChangeset
for help on using the changeset viewer.