131311 2014-04-07 12:36:34 -0700 Use displayNameForTrack instead of textTrack->label() for captions. 2014-05-02 18:14:13 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) iPhone / iPad Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jeremyj-wk jeremyj-wk commit-queue eric.carlson glenn jer.noble jonlee philipj sergio webkit-bug-importer oldest_to_newest 998206 0 jeremyj-wk 2014-04-07 12:36:34 -0700 > > Source/WebCore/platform/ios/WebVideoFullscreenModelMediaElement.mm:93 > > + legibleOptions.append(textTrack->label()); > > This is wrong, not all tracks have a label but every menu item needs to have a label. We calculate the display name in CaptionPreferences::displayNameForTrack. Probably the right thing to do here is to add a displayName method to PlatformTextTrack and have TextTrack::platformTextTrack call CaptionPreferences::displayNameForTrack. 998593 1 webkit-bug-importer 2014-04-08 09:14:14 -0700 <rdar://problem/16552360> 1005871 2 230618 jeremyj-wk 2014-05-01 15:36:42 -0700 Created attachment 230618 Patch 1005891 3 230618 darin 2014-05-01 16:14:52 -0700 Comment on attachment 230618 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=230618&action=review > Source/WebCore/platform/ios/WebVideoFullscreenModelMediaElement.h:53 > + void updateLegibleOptions(); This class has a strange organization. Normally in WebKit we put the private members last and explicitly mark the section private. > Source/WebCore/platform/ios/WebVideoFullscreenModelMediaElement.mm:126 > + } else if (event->type() == eventNames().addtrackEvent > + || event->type() == eventNames().removetrackEvent) I think this would read better on a single line. > Source/WebCore/platform/ios/WebVideoFullscreenModelMediaElement.mm:231 > + CaptionUserPreferences* captionPreferences = m_mediaElement->document().page()->group().captionPreferences(); If this can never be null it should be a reference instead of a pointer. > Source/WebCore/platform/ios/WebVideoFullscreenModelMediaElement.mm:238 > + for (unsigned i = 0, length = m_legibleTracksForMenu.size(); i < length; ++i) { > + RefPtr<TextTrack> textTrack = m_legibleTracksForMenu[i]; > + legibleOptions.append(captionPreferences->displayNameForTrack(textTrack.get())); > + } This should use a modern C++ for loop: for (auto& track : m_legibleTracksForMenu) legibleOptions.append(preferences.displayNameForTrack(track.get())); 1006038 4 jeremyj-wk 2014-05-02 10:22:23 -0700 (In reply to comment #3) > (From update of attachment 230618 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=230618&action=review > > > Source/WebCore/platform/ios/WebVideoFullscreenModelMediaElement.h:53 > > + void updateLegibleOptions(); > > This class has a strange organization. Normally in WebKit we put the private members last and explicitly mark the section private. Reordered. > > > Source/WebCore/platform/ios/WebVideoFullscreenModelMediaElement.mm:126 > > + } else if (event->type() == eventNames().addtrackEvent > > + || event->type() == eventNames().removetrackEvent) > > I think this would read better on a single line. Joined. > > > Source/WebCore/platform/ios/WebVideoFullscreenModelMediaElement.mm:231 > > + CaptionUserPreferences* captionPreferences = m_mediaElement->document().page()->group().captionPreferences(); > > If this can never be null it should be a reference instead of a pointer. Changed to reference. > > > Source/WebCore/platform/ios/WebVideoFullscreenModelMediaElement.mm:238 > > + for (unsigned i = 0, length = m_legibleTracksForMenu.size(); i < length; ++i) { > > + RefPtr<TextTrack> textTrack = m_legibleTracksForMenu[i]; > > + legibleOptions.append(captionPreferences->displayNameForTrack(textTrack.get())); > > + } > > This should use a modern C++ for loop: > > for (auto& track : m_legibleTracksForMenu) > legibleOptions.append(preferences.displayNameForTrack(track.get())); Modernized. 1006044 5 230669 jeremyj-wk 2014-05-02 10:25:58 -0700 Created attachment 230669 Patch 1006158 6 230701 jeremyj-wk 2014-05-02 14:34:45 -0700 Created attachment 230701 Patch for landing 1006162 7 230701 commit-queue 2014-05-02 14:42:41 -0700 Comment on attachment 230701 Patch for landing Rejecting attachment 230701 from commit-queue. jeremyj-wk@apple.com does not have committer permissions according to http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/common/config/contributors.json. - If you do not have committer rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags. - If you have committer rights please correct the error in Tools/Scripts/webkitpy/common/config/contributors.json by adding yourself to the file (no review needed). The commit-queue restarts itself every 2 hours. After restart the commit-queue will correctly respect your committer rights. 1006202 8 230701 commit-queue 2014-05-02 15:59:07 -0700 Comment on attachment 230701 Patch for landing Rejecting attachment 230701 from commit-queue. jeremyj-wk@apple.com does not have committer permissions according to http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/common/config/contributors.json. - If you do not have committer rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags. - If you have committer rights please correct the error in Tools/Scripts/webkitpy/common/config/contributors.json by adding yourself to the file (no review needed). The commit-queue restarts itself every 2 hours. After restart the commit-queue will correctly respect your committer rights. 1006214 9 230701 commit-queue 2014-05-02 16:26:03 -0700 Comment on attachment 230701 Patch for landing Rejecting attachment 230701 from commit-queue. jeremyj-wk@apple.com does not have committer permissions according to http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/common/config/contributors.json. - If you do not have committer rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags. - If you have committer rights please correct the error in Tools/Scripts/webkitpy/common/config/contributors.json by adding yourself to the file (no review needed). The commit-queue restarts itself every 2 hours. After restart the commit-queue will correctly respect your committer rights. 1006254 10 230701 commit-queue 2014-05-02 18:14:09 -0700 Comment on attachment 230701 Patch for landing Clearing flags on attachment: 230701 Committed r168216: <http://trac.webkit.org/changeset/168216> 1006255 11 commit-queue 2014-05-02 18:14:13 -0700 All reviewed patches have been landed. Closing bug. 230618 2014-05-01 15:36:42 -0700 2014-05-02 14:21:02 -0700 Patch bug-131311-20140501153623.patch text/plain 7274 jeremyj-wk U3VidmVyc2lvbiBSZXZpc2lvbjogMTY4MTA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjY3MTdiZDRiYTM5OWI2 YWI5ZWQ0N2EwMDhlN2E1MDc2OTRmOTQxZS4uMTJiOGRlYzMzNTVhYjgzZDQ5MzVmN2M4NDIzMGRj MDFhNTZmYmYwMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE0LTA1LTAxICBKZXJl bXkgSm9uZXMgIDxqZXJlbXlqQGFwcGxlLmNvbT4KKworICAgICAgICBVc2UgZGlzcGxheU5hbWVG b3JUcmFjayBpbnN0ZWFkIG9mIHRleHRUcmFjay0+bGFiZWwoKSBmb3IgY2FwdGlvbnMuCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzEzMTEKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVc2UgdGhlIHNhbWUg bWVjaGFuaXNtIGFzIHRoZSBkZXNrdG9wIHRvIGJ1aWxkIHRoZSBjYXB0aW9ucyBsaXN0IHNvIGl0 IGhhcyB0aGUgY29ycmVjdAorICAgICAgICBuYW1lcyBpbiB0aGUgY29ycmVjdCBvcmRlciBpbmNs dWRpbmcgbm9uZSBhbmQgYXV0b21hdGljLgorCisgICAgICAgICogcGxhdGZvcm0vaW9zL1dlYlZp ZGVvRnVsbHNjcmVlbk1vZGVsTWVkaWFFbGVtZW50Lmg6CisgICAgICAgICogcGxhdGZvcm0vaW9z L1dlYlZpZGVvRnVsbHNjcmVlbk1vZGVsTWVkaWFFbGVtZW50Lm1tOgorICAgICAgICAoV2ViVmlk ZW9GdWxsc2NyZWVuTW9kZWxNZWRpYUVsZW1lbnQ6OnNldE1lZGlhRWxlbWVudCk6CisgICAgICAg IG1vdmUgbGVnaWJsZSB0cmFjayBjb2RlIGludG8gdXBkYXRlTGVnaWJsZU9wdGlvbnMoKQorCisg ICAgICAgIChXZWJWaWRlb0Z1bGxzY3JlZW5Nb2RlbE1lZGlhRWxlbWVudDo6aGFuZGxlRXZlbnQp OgorICAgICAgICB1cGRhdGVMZWdpYmxlT3B0aW9ucyBvbiBhZGRUcmFjayBhbmQgcmVtb3ZlVHJh Y2sKKworICAgICAgICAoV2ViVmlkZW9GdWxsc2NyZWVuTW9kZWxNZWRpYUVsZW1lbnQ6OnNlbGVj dExlZ2libGVNZWRpYU9wdGlvbik6CisgICAgICAgIHNlbGVjdCB0aGUgY29ycmVzcG9uZGluZyBU ZXh0VHJhY2sgb24gSFRNTE1lZGlhRWxlbWVudC4KKworICAgICAgICAoV2ViVmlkZW9GdWxsc2Ny ZWVuTW9kZWxNZWRpYUVsZW1lbnQ6OnVwZGF0ZUxlZ2libGVPcHRpb25zKToKKyAgICAgICAgdXNl IHRoZSBzYW1lIG1lY2hhbmlzbSBhcyBkZXNrdG9wIHRvIGJ1aWxkIHRoZSBjYXB0aW9ucyBtZW51 LgorCiAyMDE0LTA0LTMwICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCiAgICAg ICAgIFtNU0VdIFNlZWtpbmcgYmV0d2VlbiB0d28gYnVmZmVyZWQgcmFuZ2VzIGVucXV1ZXMgaW5j b3JyZWN0IGJ1ZmZlcnMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3Mv V2ViVmlkZW9GdWxsc2NyZWVuTW9kZWxNZWRpYUVsZW1lbnQuaCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2lvcy9XZWJWaWRlb0Z1bGxzY3JlZW5Nb2RlbE1lZGlhRWxlbWVudC5oCmluZGV4IDhj OWU2MTA2NWM5NmQ3MDBjODhkMTgzMDMxZmQyMDAxYjVhNDJlYjMuLmJjNTc3M2QwOTIwYjVkMmIw NDMzNDgzMzNjMGVhNTc0NmEyZTQ1YjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2lvcy9XZWJWaWRlb0Z1bGxzY3JlZW5Nb2RlbE1lZGlhRWxlbWVudC5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJWaWRlb0Z1bGxzY3JlZW5Nb2RlbE1lZGlhRWxlbWVu dC5oCkBAIC0zNSw5ICszNSwxMSBAQAogI2luY2x1ZGUgPFdlYkNvcmUvV2ViVmlkZW9GdWxsc2Ny ZWVuTW9kZWwuaD4KICNpbmNsdWRlIDx3dGYvUmVmUHRyLmg+CiAjaW5jbHVkZSA8d3RmL1JldGFp blB0ci5oPgorI2luY2x1ZGUgPHd0Zi9WZWN0b3IuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewog Y2xhc3MgSFRNTE1lZGlhRWxlbWVudDsKK2NsYXNzIFRleHRUcmFjazsKIGNsYXNzIFdlYlZpZGVv RnVsbHNjcmVlbkludGVyZmFjZTsKIAogY2xhc3MgV2ViVmlkZW9GdWxsc2NyZWVuTW9kZWxNZWRp YUVsZW1lbnQgOiBwdWJsaWMgV2ViVmlkZW9GdWxsc2NyZWVuTW9kZWwsIHB1YmxpYyBFdmVudExp c3RlbmVyIHsKQEAgLTQ2LDYgKzQ4LDkgQEAgY2xhc3MgV2ViVmlkZW9GdWxsc2NyZWVuTW9kZWxN ZWRpYUVsZW1lbnQgOiBwdWJsaWMgV2ViVmlkZW9GdWxsc2NyZWVuTW9kZWwsIHB1YmwKICAgICBi b29sIG1faXNMaXN0ZW5pbmc7CiAgICAgV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlKiBtX3Zp ZGVvRnVsbHNjcmVlbkludGVyZmFjZTsKICAgICBGbG9hdFJlY3QgbV92aWRlb0ZyYW1lOworICAg IFZlY3RvcjxSZWZQdHI8VGV4dFRyYWNrPj4gbV9sZWdpYmxlVHJhY2tzRm9yTWVudTsKKworICAg IHZvaWQgdXBkYXRlTGVnaWJsZU9wdGlvbnMoKTsKICAgICAKIHB1YmxpYzoKICAgICBXZWJWaWRl b0Z1bGxzY3JlZW5Nb2RlbE1lZGlhRWxlbWVudCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vaW9zL1dlYlZpZGVvRnVsbHNjcmVlbk1vZGVsTWVkaWFFbGVtZW50Lm1tIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYlZpZGVvRnVsbHNjcmVlbk1vZGVsTWVkaWFF bGVtZW50Lm1tCmluZGV4IDEyNjAzOWM4NDFhNzEwNmQ4NTliYTU2NjNhNDM5NTNhOTFmNjBmMWQu LmE1MGQ5YzE0MTA1MDNlMTdhYTI3YzkyN2Q2NjlhZDNjOTE0Nzk0NWIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJWaWRlb0Z1bGxzY3JlZW5Nb2RlbE1lZGlhRWxl bWVudC5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvV2ViVmlkZW9GdWxsc2Ny ZWVuTW9kZWxNZWRpYUVsZW1lbnQubW0KQEAgLTM5LDcgKzM5LDEwIEBACiAjaW1wb3J0IDxXZWJD b3JlL0hUTUxFbGVtZW50Lmg+CiAjaW1wb3J0IDxXZWJDb3JlL0hUTUxNZWRpYUVsZW1lbnQuaD4K ICNpbXBvcnQgPFdlYkNvcmUvSFRNTFZpZGVvRWxlbWVudC5oPgorI2ltcG9ydCA8V2ViQ29yZS9Q YWdlLmg+CisjaW1wb3J0IDxXZWJDb3JlL1BhZ2VHcm91cC5oPgogI2ltcG9ydCA8V2ViQ29yZS9T b2Z0TGlua2luZy5oPgorI2ltcG9ydCA8V2ViQ29yZS9UZXh0VHJhY2tMaXN0Lmg+CiAjaW1wb3J0 IDxXZWJDb3JlL1RpbWVSYW5nZXMuaD4KICNpbXBvcnQgPFdlYkNvcmUvV2ViQ29yZVRocmVhZFJ1 bi5oPgogI2ltcG9ydCA8UXVhcnR6Q29yZS9Db3JlQW5pbWF0aW9uLmg+CkBAIC02OCw2ICs3MSw4 IEBAIHZvaWQgV2ViVmlkZW9GdWxsc2NyZWVuTW9kZWxNZWRpYUVsZW1lbnQ6OnNldE1lZGlhRWxl bWVudChIVE1MTWVkaWFFbGVtZW50KiBtZWRpCiAgICAgICAgIG1fbWVkaWFFbGVtZW50LT5yZW1v dmVFdmVudExpc3RlbmVyKGV2ZW50TmFtZXMoKS5wbGF5RXZlbnQsIHRoaXMsIGZhbHNlKTsKICAg ICAgICAgbV9tZWRpYUVsZW1lbnQtPnJlbW92ZUV2ZW50TGlzdGVuZXIoZXZlbnROYW1lcygpLnJh dGVjaGFuZ2VFdmVudCwgdGhpcywgZmFsc2UpOwogICAgICAgICBtX21lZGlhRWxlbWVudC0+cmVt b3ZlRXZlbnRMaXN0ZW5lcihldmVudE5hbWVzKCkudGltZXVwZGF0ZUV2ZW50LCB0aGlzLCBmYWxz ZSk7CisgICAgICAgIG1fbWVkaWFFbGVtZW50LT5yZW1vdmVFdmVudExpc3RlbmVyKGV2ZW50TmFt ZXMoKS5hZGR0cmFja0V2ZW50LCB0aGlzLCBmYWxzZSk7CisgICAgICAgIG1fbWVkaWFFbGVtZW50 LT5yZW1vdmVFdmVudExpc3RlbmVyKGV2ZW50TmFtZXMoKS5yZW1vdmV0cmFja0V2ZW50LCB0aGlz LCBmYWxzZSk7CiAgICAgfQogICAgIG1faXNMaXN0ZW5pbmcgPSBmYWxzZTsKIApAQCAtODEsMTkg Kzg2LDE2IEBAIHZvaWQgV2ViVmlkZW9GdWxsc2NyZWVuTW9kZWxNZWRpYUVsZW1lbnQ6OnNldE1l ZGlhRWxlbWVudChIVE1MTWVkaWFFbGVtZW50KiBtZWRpCiAgICAgbV9tZWRpYUVsZW1lbnQtPmFk ZEV2ZW50TGlzdGVuZXIoZXZlbnROYW1lcygpLnBsYXlFdmVudCwgdGhpcywgZmFsc2UpOwogICAg IG1fbWVkaWFFbGVtZW50LT5hZGRFdmVudExpc3RlbmVyKGV2ZW50TmFtZXMoKS5yYXRlY2hhbmdl RXZlbnQsIHRoaXMsIGZhbHNlKTsKICAgICBtX21lZGlhRWxlbWVudC0+YWRkRXZlbnRMaXN0ZW5l cihldmVudE5hbWVzKCkudGltZXVwZGF0ZUV2ZW50LCB0aGlzLCBmYWxzZSk7CisgICAgbV9tZWRp YUVsZW1lbnQtPmFkZEV2ZW50TGlzdGVuZXIoZXZlbnROYW1lcygpLmFkZHRyYWNrRXZlbnQsIHRo aXMsIGZhbHNlKTsKKyAgICBtX21lZGlhRWxlbWVudC0+YWRkRXZlbnRMaXN0ZW5lcihldmVudE5h bWVzKCkucmVtb3ZldHJhY2tFdmVudCwgdGhpcywgZmFsc2UpOwogICAgIG1faXNMaXN0ZW5pbmcg PSB0cnVlOwogCiAgICAgbV92aWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2UtPnNldER1cmF0aW9uKG1f bWVkaWFFbGVtZW50LT5kdXJhdGlvbigpKTsKICAgICBtX3ZpZGVvRnVsbHNjcmVlbkludGVyZmFj ZS0+c2V0U2Vla2FibGVSYW5nZXMoKm1fbWVkaWFFbGVtZW50LT5zZWVrYWJsZSgpKTsKICAgICBt X3ZpZGVvRnVsbHNjcmVlbkludGVyZmFjZS0+c2V0UmF0ZSghbV9tZWRpYUVsZW1lbnQtPnBhdXNl ZCgpLCBtX21lZGlhRWxlbWVudC0+cGxheWJhY2tSYXRlKCkpOwogCi0gICAgVmVjdG9yPFN0cmlu Zz4gbGVnaWJsZU9wdGlvbnM7Ci0gICAgCi0gICAgZm9yIChhdXRvJiB0ZXh0VHJhY2sgOiBtX21l ZGlhRWxlbWVudC0+cGxhdGZvcm1UZXh0VHJhY2tzKCkpCi0gICAgICAgIGxlZ2libGVPcHRpb25z LmFwcGVuZCh0ZXh0VHJhY2stPmxhYmVsKCkpOwotICAgIAotICAgIG1fdmlkZW9GdWxsc2NyZWVu SW50ZXJmYWNlLT5zZXRMZWdpYmxlTWVkaWFTZWxlY3Rpb25PcHRpb25zKGxlZ2libGVPcHRpb25z LCAwKTsKLSAgICAKKyAgICB1cGRhdGVMZWdpYmxlT3B0aW9ucygpOworCiAgICAgbV92aWRlb0Z1 bGxzY3JlZW5JbnRlcmZhY2UtPnNldEN1cnJlbnRUaW1lKG1fbWVkaWFFbGVtZW50LT5jdXJyZW50 VGltZSgpLCBbW05TUHJvY2Vzc0luZm8gcHJvY2Vzc0luZm9dIHN5c3RlbVVwdGltZV0pOwogCiAg ICAgaWYgKGlzSFRNTFZpZGVvRWxlbWVudChtX21lZGlhRWxlbWVudC5nZXQoKSkpIHsKQEAgLTEy MCw3ICsxMjIsOSBAQCB2b2lkIFdlYlZpZGVvRnVsbHNjcmVlbk1vZGVsTWVkaWFFbGVtZW50Ojpo YW5kbGVFdmVudChXZWJDb3JlOjpTY3JpcHRFeGVjdXRpb25DbwogICAgICAgICBtX3ZpZGVvRnVs bHNjcmVlbkludGVyZmFjZS0+c2V0Q3VycmVudFRpbWUobV9tZWRpYUVsZW1lbnQtPmN1cnJlbnRU aW1lKCksIFtbTlNQcm9jZXNzSW5mbyBwcm9jZXNzSW5mb10gc3lzdGVtVXB0aW1lXSk7CiAgICAg ICAgIC8vIEZJWE1FOiAxMzA3ODggLSBmaW5kIGEgYmV0dGVyIGV2ZW50IHRvIHVwZGF0ZSBzZWVr YWJsZSByYW5nZXMgZnJvbS4KICAgICAgICAgbV92aWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2UtPnNl dFNlZWthYmxlUmFuZ2VzKCptX21lZGlhRWxlbWVudC0+c2Vla2FibGUoKSk7Ci0gICAgfQorICAg IH0gZWxzZSBpZiAoZXZlbnQtPnR5cGUoKSA9PSBldmVudE5hbWVzKCkuYWRkdHJhY2tFdmVudAor ICAgICAgICB8fCBldmVudC0+dHlwZSgpID09IGV2ZW50TmFtZXMoKS5yZW1vdmV0cmFja0V2ZW50 KQorICAgICAgICB1cGRhdGVMZWdpYmxlT3B0aW9ucygpOwogfQogCiB2b2lkIFdlYlZpZGVvRnVs bHNjcmVlbk1vZGVsTWVkaWFFbGVtZW50OjpzZXRWaWRlb0Z1bGxzY3JlZW5MYXllcihQbGF0Zm9y bUxheWVyKiB2aWRlb0xheWVyKQpAQCAtMjEwLDEyICsyMTQsMzAgQEAgdm9pZCBXZWJWaWRlb0Z1 bGxzY3JlZW5Nb2RlbE1lZGlhRWxlbWVudDo6c2VsZWN0QXVkaW9NZWRpYU9wdGlvbih1aW50NjRf dCkKIAogdm9pZCBXZWJWaWRlb0Z1bGxzY3JlZW5Nb2RlbE1lZGlhRWxlbWVudDo6c2VsZWN0TGVn aWJsZU1lZGlhT3B0aW9uKHVpbnQ2NF90IGluZGV4KQogewotICAgIFJlZlB0cjxQbGF0Zm9ybVRl eHRUcmFjaz4gcGxhdGZvcm1UcmFjazsKKyAgICBUZXh0VHJhY2sqIHRleHRUcmFjayA9IG51bGxw dHI7CiAgICAgCi0gICAgaWYgKGluZGV4IDwgbV9tZWRpYUVsZW1lbnQtPnBsYXRmb3JtVGV4dFRy YWNrcygpLnNpemUoKSkKLSAgICAgICAgcGxhdGZvcm1UcmFjayA9IG1fbWVkaWFFbGVtZW50LT5w bGF0Zm9ybVRleHRUcmFja3MoKVtzdGF0aWNfY2FzdDxzaXplX3Q+KGluZGV4KV07CisgICAgaWYg KGluZGV4IDwgbV9sZWdpYmxlVHJhY2tzRm9yTWVudS5zaXplKCkpCisgICAgICAgIHRleHRUcmFj ayA9IG1fbGVnaWJsZVRyYWNrc0Zvck1lbnVbc3RhdGljX2Nhc3Q8c2l6ZV90PihpbmRleCldLmdl dCgpOwogICAgIAotICAgIG1fbWVkaWFFbGVtZW50LT5zZXRTZWxlY3RlZFRleHRUcmFjayhwbGF0 Zm9ybVRyYWNrKTsKKyAgICBtX21lZGlhRWxlbWVudC0+c2V0U2VsZWN0ZWRUZXh0VHJhY2sodGV4 dFRyYWNrKTsKK30KKwordm9pZCBXZWJWaWRlb0Z1bGxzY3JlZW5Nb2RlbE1lZGlhRWxlbWVudDo6 dXBkYXRlTGVnaWJsZU9wdGlvbnMoKQoreworICAgIFRleHRUcmFja0xpc3QqIHRyYWNrTGlzdCA9 IG1fbWVkaWFFbGVtZW50LT50ZXh0VHJhY2tzKCk7CisgICAgaWYgKCF0cmFja0xpc3QgfHwgIXRy YWNrTGlzdC0+bGVuZ3RoKCkgfHwgIW1fbWVkaWFFbGVtZW50LT5kb2N1bWVudCgpLnBhZ2UoKSkK KyAgICAgICAgcmV0dXJuOworCisgICAgQ2FwdGlvblVzZXJQcmVmZXJlbmNlcyogY2FwdGlvblBy ZWZlcmVuY2VzID0gbV9tZWRpYUVsZW1lbnQtPmRvY3VtZW50KCkucGFnZSgpLT5ncm91cCgpLmNh cHRpb25QcmVmZXJlbmNlcygpOworICAgIG1fbGVnaWJsZVRyYWNrc0Zvck1lbnUgPSBjYXB0aW9u UHJlZmVyZW5jZXMtPnNvcnRlZFRyYWNrTGlzdEZvck1lbnUodHJhY2tMaXN0KTsKKworICAgIFZl Y3RvcjxTdHJpbmc+IGxlZ2libGVPcHRpb25zOworICAgIGZvciAodW5zaWduZWQgaSA9IDAsIGxl bmd0aCA9IG1fbGVnaWJsZVRyYWNrc0Zvck1lbnUuc2l6ZSgpOyBpIDwgbGVuZ3RoOyArK2kpIHsK KyAgICAgICAgUmVmUHRyPFRleHRUcmFjaz4gdGV4dFRyYWNrID0gbV9sZWdpYmxlVHJhY2tzRm9y TWVudVtpXTsKKyAgICAgICAgbGVnaWJsZU9wdGlvbnMuYXBwZW5kKGNhcHRpb25QcmVmZXJlbmNl cy0+ZGlzcGxheU5hbWVGb3JUcmFjayh0ZXh0VHJhY2suZ2V0KCkpKTsKKyAgICB9CisKKyAgICBt X3ZpZGVvRnVsbHNjcmVlbkludGVyZmFjZS0+c2V0TGVnaWJsZU1lZGlhU2VsZWN0aW9uT3B0aW9u cyhsZWdpYmxlT3B0aW9ucywgMCk7CiB9CiAKICNlbmRpZgo= 230669 2014-05-02 10:25:58 -0700 2014-05-02 14:20:19 -0700 Patch bug-131311-20140502102539.patch text/plain 7693 jeremyj-wk U3VidmVyc2lvbiBSZXZpc2lvbjogMTY4MTA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjY3MTdiZDRiYTM5OWI2 YWI5ZWQ0N2EwMDhlN2E1MDc2OTRmOTQxZS4uMTJiOGRlYzMzNTVhYjgzZDQ5MzVmN2M4NDIzMGRj MDFhNTZmYmYwMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE0LTA1LTAxICBKZXJl bXkgSm9uZXMgIDxqZXJlbXlqQGFwcGxlLmNvbT4KKworICAgICAgICBVc2UgZGlzcGxheU5hbWVG b3JUcmFjayBpbnN0ZWFkIG9mIHRleHRUcmFjay0+bGFiZWwoKSBmb3IgY2FwdGlvbnMuCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzEzMTEKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVc2UgdGhlIHNhbWUg bWVjaGFuaXNtIGFzIHRoZSBkZXNrdG9wIHRvIGJ1aWxkIHRoZSBjYXB0aW9ucyBsaXN0IHNvIGl0 IGhhcyB0aGUgY29ycmVjdAorICAgICAgICBuYW1lcyBpbiB0aGUgY29ycmVjdCBvcmRlciBpbmNs dWRpbmcgbm9uZSBhbmQgYXV0b21hdGljLgorCisgICAgICAgICogcGxhdGZvcm0vaW9zL1dlYlZp ZGVvRnVsbHNjcmVlbk1vZGVsTWVkaWFFbGVtZW50Lmg6CisgICAgICAgICogcGxhdGZvcm0vaW9z L1dlYlZpZGVvRnVsbHNjcmVlbk1vZGVsTWVkaWFFbGVtZW50Lm1tOgorICAgICAgICAoV2ViVmlk ZW9GdWxsc2NyZWVuTW9kZWxNZWRpYUVsZW1lbnQ6OnNldE1lZGlhRWxlbWVudCk6CisgICAgICAg IG1vdmUgbGVnaWJsZSB0cmFjayBjb2RlIGludG8gdXBkYXRlTGVnaWJsZU9wdGlvbnMoKQorCisg ICAgICAgIChXZWJWaWRlb0Z1bGxzY3JlZW5Nb2RlbE1lZGlhRWxlbWVudDo6aGFuZGxlRXZlbnQp OgorICAgICAgICB1cGRhdGVMZWdpYmxlT3B0aW9ucyBvbiBhZGRUcmFjayBhbmQgcmVtb3ZlVHJh Y2sKKworICAgICAgICAoV2ViVmlkZW9GdWxsc2NyZWVuTW9kZWxNZWRpYUVsZW1lbnQ6OnNlbGVj dExlZ2libGVNZWRpYU9wdGlvbik6CisgICAgICAgIHNlbGVjdCB0aGUgY29ycmVzcG9uZGluZyBU ZXh0VHJhY2sgb24gSFRNTE1lZGlhRWxlbWVudC4KKworICAgICAgICAoV2ViVmlkZW9GdWxsc2Ny ZWVuTW9kZWxNZWRpYUVsZW1lbnQ6OnVwZGF0ZUxlZ2libGVPcHRpb25zKToKKyAgICAgICAgdXNl IHRoZSBzYW1lIG1lY2hhbmlzbSBhcyBkZXNrdG9wIHRvIGJ1aWxkIHRoZSBjYXB0aW9ucyBtZW51 LgorCiAyMDE0LTA0LTMwICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCiAgICAg ICAgIFtNU0VdIFNlZWtpbmcgYmV0d2VlbiB0d28gYnVmZmVyZWQgcmFuZ2VzIGVucXV1ZXMgaW5j b3JyZWN0IGJ1ZmZlcnMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3Mv V2ViVmlkZW9GdWxsc2NyZWVuTW9kZWxNZWRpYUVsZW1lbnQuaCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2lvcy9XZWJWaWRlb0Z1bGxzY3JlZW5Nb2RlbE1lZGlhRWxlbWVudC5oCmluZGV4IDhj OWU2MTA2NWM5NmQ3MDBjODhkMTgzMDMxZmQyMDAxYjVhNDJlYjMuLmRkZjNmYTY4MzU1ZDQ5NzJl NThlMjI0Y2VlMGI4NDAwYzE1Yjc4NGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2lvcy9XZWJWaWRlb0Z1bGxzY3JlZW5Nb2RlbE1lZGlhRWxlbWVudC5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJWaWRlb0Z1bGxzY3JlZW5Nb2RlbE1lZGlhRWxlbWVu dC5oCkBAIC0zNSwxOCArMzUsMTQgQEAKICNpbmNsdWRlIDxXZWJDb3JlL1dlYlZpZGVvRnVsbHNj cmVlbk1vZGVsLmg+CiAjaW5jbHVkZSA8d3RmL1JlZlB0ci5oPgogI2luY2x1ZGUgPHd0Zi9SZXRh aW5QdHIuaD4KKyNpbmNsdWRlIDx3dGYvVmVjdG9yLmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsK IGNsYXNzIEhUTUxNZWRpYUVsZW1lbnQ7CitjbGFzcyBUZXh0VHJhY2s7CiBjbGFzcyBXZWJWaWRl b0Z1bGxzY3JlZW5JbnRlcmZhY2U7CiAKIGNsYXNzIFdlYlZpZGVvRnVsbHNjcmVlbk1vZGVsTWVk aWFFbGVtZW50IDogcHVibGljIFdlYlZpZGVvRnVsbHNjcmVlbk1vZGVsLCBwdWJsaWMgRXZlbnRM aXN0ZW5lciB7Ci0gICAgUmVmUHRyPEhUTUxNZWRpYUVsZW1lbnQ+IG1fbWVkaWFFbGVtZW50Owot ICAgIFJldGFpblB0cjxQbGF0Zm9ybUxheWVyPiBtX3ZpZGVvRnVsbHNjcmVlbkxheWVyOwotICAg IGJvb2wgbV9pc0xpc3RlbmluZzsKLSAgICBXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2UqIG1f dmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlOwotICAgIEZsb2F0UmVjdCBtX3ZpZGVvRnJhbWU7Ci0g ICAgCiBwdWJsaWM6CiAgICAgV2ViVmlkZW9GdWxsc2NyZWVuTW9kZWxNZWRpYUVsZW1lbnQoKTsK ICAgICB2aXJ0dWFsIH5XZWJWaWRlb0Z1bGxzY3JlZW5Nb2RlbE1lZGlhRWxlbWVudCgpOwpAQCAt NjcsNiArNjMsMTYgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBzZXRWaWRlb0xheWVyR3Jh dml0eShXZWJWaWRlb0Z1bGxzY3JlZW5Nb2RlbDo6VmlkZW9HcmF2aXR5KSBvdmVycmlkZTsKICAg ICB2aXJ0dWFsIHZvaWQgc2VsZWN0QXVkaW9NZWRpYU9wdGlvbih1aW50NjRfdCBpbmRleCkgb3Zl cnJpZGU7CiAgICAgdmlydHVhbCB2b2lkIHNlbGVjdExlZ2libGVNZWRpYU9wdGlvbih1aW50NjRf dCBpbmRleCkgb3ZlcnJpZGU7CisKK3ByaXZhdGU6CisgICAgUmVmUHRyPEhUTUxNZWRpYUVsZW1l bnQ+IG1fbWVkaWFFbGVtZW50OworICAgIFJldGFpblB0cjxQbGF0Zm9ybUxheWVyPiBtX3ZpZGVv RnVsbHNjcmVlbkxheWVyOworICAgIGJvb2wgbV9pc0xpc3RlbmluZzsKKyAgICBXZWJWaWRlb0Z1 bGxzY3JlZW5JbnRlcmZhY2UqIG1fdmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlOworICAgIEZsb2F0 UmVjdCBtX3ZpZGVvRnJhbWU7CisgICAgVmVjdG9yPFJlZlB0cjxUZXh0VHJhY2s+PiBtX2xlZ2li bGVUcmFja3NGb3JNZW51OworCisgICAgdm9pZCB1cGRhdGVMZWdpYmxlT3B0aW9ucygpOwogfTsK IAogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYlZpZGVvRnVs bHNjcmVlbk1vZGVsTWVkaWFFbGVtZW50Lm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9z L1dlYlZpZGVvRnVsbHNjcmVlbk1vZGVsTWVkaWFFbGVtZW50Lm1tCmluZGV4IDEyNjAzOWM4NDFh NzEwNmQ4NTliYTU2NjNhNDM5NTNhOTFmNjBmMWQuLmQ5OTkyNGQ0YWFiMzNlNjkwMTE5MDY3M2Y2 YmQxNWEzNmVkOWYzYTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9X ZWJWaWRlb0Z1bGxzY3JlZW5Nb2RlbE1lZGlhRWxlbWVudC5tbQorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9pb3MvV2ViVmlkZW9GdWxsc2NyZWVuTW9kZWxNZWRpYUVsZW1lbnQubW0KQEAg LTM5LDcgKzM5LDEwIEBACiAjaW1wb3J0IDxXZWJDb3JlL0hUTUxFbGVtZW50Lmg+CiAjaW1wb3J0 IDxXZWJDb3JlL0hUTUxNZWRpYUVsZW1lbnQuaD4KICNpbXBvcnQgPFdlYkNvcmUvSFRNTFZpZGVv RWxlbWVudC5oPgorI2ltcG9ydCA8V2ViQ29yZS9QYWdlLmg+CisjaW1wb3J0IDxXZWJDb3JlL1Bh Z2VHcm91cC5oPgogI2ltcG9ydCA8V2ViQ29yZS9Tb2Z0TGlua2luZy5oPgorI2ltcG9ydCA8V2Vi Q29yZS9UZXh0VHJhY2tMaXN0Lmg+CiAjaW1wb3J0IDxXZWJDb3JlL1RpbWVSYW5nZXMuaD4KICNp bXBvcnQgPFdlYkNvcmUvV2ViQ29yZVRocmVhZFJ1bi5oPgogI2ltcG9ydCA8UXVhcnR6Q29yZS9D b3JlQW5pbWF0aW9uLmg+CkBAIC02OCw2ICs3MSw4IEBAIHZvaWQgV2ViVmlkZW9GdWxsc2NyZWVu TW9kZWxNZWRpYUVsZW1lbnQ6OnNldE1lZGlhRWxlbWVudChIVE1MTWVkaWFFbGVtZW50KiBtZWRp CiAgICAgICAgIG1fbWVkaWFFbGVtZW50LT5yZW1vdmVFdmVudExpc3RlbmVyKGV2ZW50TmFtZXMo KS5wbGF5RXZlbnQsIHRoaXMsIGZhbHNlKTsKICAgICAgICAgbV9tZWRpYUVsZW1lbnQtPnJlbW92 ZUV2ZW50TGlzdGVuZXIoZXZlbnROYW1lcygpLnJhdGVjaGFuZ2VFdmVudCwgdGhpcywgZmFsc2Up OwogICAgICAgICBtX21lZGlhRWxlbWVudC0+cmVtb3ZlRXZlbnRMaXN0ZW5lcihldmVudE5hbWVz KCkudGltZXVwZGF0ZUV2ZW50LCB0aGlzLCBmYWxzZSk7CisgICAgICAgIG1fbWVkaWFFbGVtZW50 LT5yZW1vdmVFdmVudExpc3RlbmVyKGV2ZW50TmFtZXMoKS5hZGR0cmFja0V2ZW50LCB0aGlzLCBm YWxzZSk7CisgICAgICAgIG1fbWVkaWFFbGVtZW50LT5yZW1vdmVFdmVudExpc3RlbmVyKGV2ZW50 TmFtZXMoKS5yZW1vdmV0cmFja0V2ZW50LCB0aGlzLCBmYWxzZSk7CiAgICAgfQogICAgIG1faXNM aXN0ZW5pbmcgPSBmYWxzZTsKIApAQCAtODEsMTkgKzg2LDE2IEBAIHZvaWQgV2ViVmlkZW9GdWxs c2NyZWVuTW9kZWxNZWRpYUVsZW1lbnQ6OnNldE1lZGlhRWxlbWVudChIVE1MTWVkaWFFbGVtZW50 KiBtZWRpCiAgICAgbV9tZWRpYUVsZW1lbnQtPmFkZEV2ZW50TGlzdGVuZXIoZXZlbnROYW1lcygp LnBsYXlFdmVudCwgdGhpcywgZmFsc2UpOwogICAgIG1fbWVkaWFFbGVtZW50LT5hZGRFdmVudExp c3RlbmVyKGV2ZW50TmFtZXMoKS5yYXRlY2hhbmdlRXZlbnQsIHRoaXMsIGZhbHNlKTsKICAgICBt X21lZGlhRWxlbWVudC0+YWRkRXZlbnRMaXN0ZW5lcihldmVudE5hbWVzKCkudGltZXVwZGF0ZUV2 ZW50LCB0aGlzLCBmYWxzZSk7CisgICAgbV9tZWRpYUVsZW1lbnQtPmFkZEV2ZW50TGlzdGVuZXIo ZXZlbnROYW1lcygpLmFkZHRyYWNrRXZlbnQsIHRoaXMsIGZhbHNlKTsKKyAgICBtX21lZGlhRWxl bWVudC0+YWRkRXZlbnRMaXN0ZW5lcihldmVudE5hbWVzKCkucmVtb3ZldHJhY2tFdmVudCwgdGhp cywgZmFsc2UpOwogICAgIG1faXNMaXN0ZW5pbmcgPSB0cnVlOwogCiAgICAgbV92aWRlb0Z1bGxz Y3JlZW5JbnRlcmZhY2UtPnNldER1cmF0aW9uKG1fbWVkaWFFbGVtZW50LT5kdXJhdGlvbigpKTsK ICAgICBtX3ZpZGVvRnVsbHNjcmVlbkludGVyZmFjZS0+c2V0U2Vla2FibGVSYW5nZXMoKm1fbWVk aWFFbGVtZW50LT5zZWVrYWJsZSgpKTsKICAgICBtX3ZpZGVvRnVsbHNjcmVlbkludGVyZmFjZS0+ c2V0UmF0ZSghbV9tZWRpYUVsZW1lbnQtPnBhdXNlZCgpLCBtX21lZGlhRWxlbWVudC0+cGxheWJh Y2tSYXRlKCkpOwogCi0gICAgVmVjdG9yPFN0cmluZz4gbGVnaWJsZU9wdGlvbnM7Ci0gICAgCi0g ICAgZm9yIChhdXRvJiB0ZXh0VHJhY2sgOiBtX21lZGlhRWxlbWVudC0+cGxhdGZvcm1UZXh0VHJh Y2tzKCkpCi0gICAgICAgIGxlZ2libGVPcHRpb25zLmFwcGVuZCh0ZXh0VHJhY2stPmxhYmVsKCkp OwotICAgIAotICAgIG1fdmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlLT5zZXRMZWdpYmxlTWVkaWFT ZWxlY3Rpb25PcHRpb25zKGxlZ2libGVPcHRpb25zLCAwKTsKLSAgICAKKyAgICB1cGRhdGVMZWdp YmxlT3B0aW9ucygpOworCiAgICAgbV92aWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2UtPnNldEN1cnJl bnRUaW1lKG1fbWVkaWFFbGVtZW50LT5jdXJyZW50VGltZSgpLCBbW05TUHJvY2Vzc0luZm8gcHJv Y2Vzc0luZm9dIHN5c3RlbVVwdGltZV0pOwogCiAgICAgaWYgKGlzSFRNTFZpZGVvRWxlbWVudCht X21lZGlhRWxlbWVudC5nZXQoKSkpIHsKQEAgLTEyMCw3ICsxMjIsOCBAQCB2b2lkIFdlYlZpZGVv RnVsbHNjcmVlbk1vZGVsTWVkaWFFbGVtZW50OjpoYW5kbGVFdmVudChXZWJDb3JlOjpTY3JpcHRF eGVjdXRpb25DbwogICAgICAgICBtX3ZpZGVvRnVsbHNjcmVlbkludGVyZmFjZS0+c2V0Q3VycmVu dFRpbWUobV9tZWRpYUVsZW1lbnQtPmN1cnJlbnRUaW1lKCksIFtbTlNQcm9jZXNzSW5mbyBwcm9j ZXNzSW5mb10gc3lzdGVtVXB0aW1lXSk7CiAgICAgICAgIC8vIEZJWE1FOiAxMzA3ODggLSBmaW5k IGEgYmV0dGVyIGV2ZW50IHRvIHVwZGF0ZSBzZWVrYWJsZSByYW5nZXMgZnJvbS4KICAgICAgICAg bV92aWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2UtPnNldFNlZWthYmxlUmFuZ2VzKCptX21lZGlhRWxl bWVudC0+c2Vla2FibGUoKSk7Ci0gICAgfQorICAgIH0gZWxzZSBpZiAoZXZlbnQtPnR5cGUoKSA9 PSBldmVudE5hbWVzKCkuYWRkdHJhY2tFdmVudCB8fCBldmVudC0+dHlwZSgpID09IGV2ZW50TmFt ZXMoKS5yZW1vdmV0cmFja0V2ZW50KQorICAgICAgICB1cGRhdGVMZWdpYmxlT3B0aW9ucygpOwog fQogCiB2b2lkIFdlYlZpZGVvRnVsbHNjcmVlbk1vZGVsTWVkaWFFbGVtZW50OjpzZXRWaWRlb0Z1 bGxzY3JlZW5MYXllcihQbGF0Zm9ybUxheWVyKiB2aWRlb0xheWVyKQpAQCAtMjEwLDEyICsyMTMs MjggQEAgdm9pZCBXZWJWaWRlb0Z1bGxzY3JlZW5Nb2RlbE1lZGlhRWxlbWVudDo6c2VsZWN0QXVk aW9NZWRpYU9wdGlvbih1aW50NjRfdCkKIAogdm9pZCBXZWJWaWRlb0Z1bGxzY3JlZW5Nb2RlbE1l ZGlhRWxlbWVudDo6c2VsZWN0TGVnaWJsZU1lZGlhT3B0aW9uKHVpbnQ2NF90IGluZGV4KQogewot ICAgIFJlZlB0cjxQbGF0Zm9ybVRleHRUcmFjaz4gcGxhdGZvcm1UcmFjazsKKyAgICBUZXh0VHJh Y2sqIHRleHRUcmFjayA9IG51bGxwdHI7CiAgICAgCi0gICAgaWYgKGluZGV4IDwgbV9tZWRpYUVs ZW1lbnQtPnBsYXRmb3JtVGV4dFRyYWNrcygpLnNpemUoKSkKLSAgICAgICAgcGxhdGZvcm1UcmFj ayA9IG1fbWVkaWFFbGVtZW50LT5wbGF0Zm9ybVRleHRUcmFja3MoKVtzdGF0aWNfY2FzdDxzaXpl X3Q+KGluZGV4KV07CisgICAgaWYgKGluZGV4IDwgbV9sZWdpYmxlVHJhY2tzRm9yTWVudS5zaXpl KCkpCisgICAgICAgIHRleHRUcmFjayA9IG1fbGVnaWJsZVRyYWNrc0Zvck1lbnVbc3RhdGljX2Nh c3Q8c2l6ZV90PihpbmRleCldLmdldCgpOwogICAgIAotICAgIG1fbWVkaWFFbGVtZW50LT5zZXRT ZWxlY3RlZFRleHRUcmFjayhwbGF0Zm9ybVRyYWNrKTsKKyAgICBtX21lZGlhRWxlbWVudC0+c2V0 U2VsZWN0ZWRUZXh0VHJhY2sodGV4dFRyYWNrKTsKK30KKwordm9pZCBXZWJWaWRlb0Z1bGxzY3Jl ZW5Nb2RlbE1lZGlhRWxlbWVudDo6dXBkYXRlTGVnaWJsZU9wdGlvbnMoKQoreworICAgIFRleHRU cmFja0xpc3QqIHRyYWNrTGlzdCA9IG1fbWVkaWFFbGVtZW50LT50ZXh0VHJhY2tzKCk7CisgICAg aWYgKCF0cmFja0xpc3QgfHwgIXRyYWNrTGlzdC0+bGVuZ3RoKCkgfHwgIW1fbWVkaWFFbGVtZW50 LT5kb2N1bWVudCgpLnBhZ2UoKSkKKyAgICAgICAgcmV0dXJuOworCisgICAgQ2FwdGlvblVzZXJQ cmVmZXJlbmNlcyYgY2FwdGlvblByZWZlcmVuY2VzID0gKm1fbWVkaWFFbGVtZW50LT5kb2N1bWVu dCgpLnBhZ2UoKS0+Z3JvdXAoKS5jYXB0aW9uUHJlZmVyZW5jZXMoKTsKKyAgICBtX2xlZ2libGVU cmFja3NGb3JNZW51ID0gY2FwdGlvblByZWZlcmVuY2VzLnNvcnRlZFRyYWNrTGlzdEZvck1lbnUo dHJhY2tMaXN0KTsKKworICAgIFZlY3RvcjxTdHJpbmc+IGxlZ2libGVPcHRpb25zOworICAgIGZv ciAoYXV0byYgdHJhY2sgOiBtX2xlZ2libGVUcmFja3NGb3JNZW51KQorICAgICAgICBsZWdpYmxl T3B0aW9ucy5hcHBlbmQoY2FwdGlvblByZWZlcmVuY2VzLmRpc3BsYXlOYW1lRm9yVHJhY2sodHJh Y2suZ2V0KCkpKTsKKworICAgIG1fdmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlLT5zZXRMZWdpYmxl TWVkaWFTZWxlY3Rpb25PcHRpb25zKGxlZ2libGVPcHRpb25zLCAwKTsKIH0KIAogI2VuZGlmCg== 230701 2014-05-02 14:34:45 -0700 2014-05-02 18:14:09 -0700 Patch for landing bug-131311-20140502143425.patch text/plain 7690 jeremyj-wk U3VidmVyc2lvbiBSZXZpc2lvbjogMTY4MTA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjY3MTdiZDRiYTM5OWI2 YWI5ZWQ0N2EwMDhlN2E1MDc2OTRmOTQxZS4uYTEyNmUwYzNmZjVlZGM0YzNjMGI0OWI5MTdlZDQ1 NjJjNDg0ZDIzMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE0LTA1LTAxICBKZXJl bXkgSm9uZXMgIDxqZXJlbXlqQGFwcGxlLmNvbT4KKworICAgICAgICBVc2UgZGlzcGxheU5hbWVG b3JUcmFjayBpbnN0ZWFkIG9mIHRleHRUcmFjay0+bGFiZWwoKSBmb3IgY2FwdGlvbnMuCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzEzMTEKKworICAg ICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KKworICAgICAgICBVc2UgdGhlIHNhbWUgbWVj aGFuaXNtIGFzIHRoZSBkZXNrdG9wIHRvIGJ1aWxkIHRoZSBjYXB0aW9ucyBsaXN0IHNvIGl0IGhh cyB0aGUgY29ycmVjdAorICAgICAgICBuYW1lcyBpbiB0aGUgY29ycmVjdCBvcmRlciBpbmNsdWRp bmcgbm9uZSBhbmQgYXV0b21hdGljLgorCisgICAgICAgICogcGxhdGZvcm0vaW9zL1dlYlZpZGVv RnVsbHNjcmVlbk1vZGVsTWVkaWFFbGVtZW50Lmg6CisgICAgICAgICogcGxhdGZvcm0vaW9zL1dl YlZpZGVvRnVsbHNjcmVlbk1vZGVsTWVkaWFFbGVtZW50Lm1tOgorICAgICAgICAoV2ViVmlkZW9G dWxsc2NyZWVuTW9kZWxNZWRpYUVsZW1lbnQ6OnNldE1lZGlhRWxlbWVudCk6CisgICAgICAgIG1v dmUgbGVnaWJsZSB0cmFjayBjb2RlIGludG8gdXBkYXRlTGVnaWJsZU9wdGlvbnMoKQorCisgICAg ICAgIChXZWJWaWRlb0Z1bGxzY3JlZW5Nb2RlbE1lZGlhRWxlbWVudDo6aGFuZGxlRXZlbnQpOgor ICAgICAgICB1cGRhdGVMZWdpYmxlT3B0aW9ucyBvbiBhZGRUcmFjayBhbmQgcmVtb3ZlVHJhY2sK KworICAgICAgICAoV2ViVmlkZW9GdWxsc2NyZWVuTW9kZWxNZWRpYUVsZW1lbnQ6OnNlbGVjdExl Z2libGVNZWRpYU9wdGlvbik6CisgICAgICAgIHNlbGVjdCB0aGUgY29ycmVzcG9uZGluZyBUZXh0 VHJhY2sgb24gSFRNTE1lZGlhRWxlbWVudC4KKworICAgICAgICAoV2ViVmlkZW9GdWxsc2NyZWVu TW9kZWxNZWRpYUVsZW1lbnQ6OnVwZGF0ZUxlZ2libGVPcHRpb25zKToKKyAgICAgICAgdXNlIHRo ZSBzYW1lIG1lY2hhbmlzbSBhcyBkZXNrdG9wIHRvIGJ1aWxkIHRoZSBjYXB0aW9ucyBtZW51Lgor CiAyMDE0LTA0LTMwICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCiAgICAgICAg IFtNU0VdIFNlZWtpbmcgYmV0d2VlbiB0d28gYnVmZmVyZWQgcmFuZ2VzIGVucXV1ZXMgaW5jb3Jy ZWN0IGJ1ZmZlcnMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvV2Vi VmlkZW9GdWxsc2NyZWVuTW9kZWxNZWRpYUVsZW1lbnQuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2lvcy9XZWJWaWRlb0Z1bGxzY3JlZW5Nb2RlbE1lZGlhRWxlbWVudC5oCmluZGV4IDhjOWU2 MTA2NWM5NmQ3MDBjODhkMTgzMDMxZmQyMDAxYjVhNDJlYjMuLmRkZjNmYTY4MzU1ZDQ5NzJlNThl MjI0Y2VlMGI4NDAwYzE1Yjc4NGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2lvcy9XZWJWaWRlb0Z1bGxzY3JlZW5Nb2RlbE1lZGlhRWxlbWVudC5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJWaWRlb0Z1bGxzY3JlZW5Nb2RlbE1lZGlhRWxlbWVudC5o CkBAIC0zNSwxOCArMzUsMTQgQEAKICNpbmNsdWRlIDxXZWJDb3JlL1dlYlZpZGVvRnVsbHNjcmVl bk1vZGVsLmg+CiAjaW5jbHVkZSA8d3RmL1JlZlB0ci5oPgogI2luY2x1ZGUgPHd0Zi9SZXRhaW5Q dHIuaD4KKyNpbmNsdWRlIDx3dGYvVmVjdG9yLmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIGNs YXNzIEhUTUxNZWRpYUVsZW1lbnQ7CitjbGFzcyBUZXh0VHJhY2s7CiBjbGFzcyBXZWJWaWRlb0Z1 bGxzY3JlZW5JbnRlcmZhY2U7CiAKIGNsYXNzIFdlYlZpZGVvRnVsbHNjcmVlbk1vZGVsTWVkaWFF bGVtZW50IDogcHVibGljIFdlYlZpZGVvRnVsbHNjcmVlbk1vZGVsLCBwdWJsaWMgRXZlbnRMaXN0 ZW5lciB7Ci0gICAgUmVmUHRyPEhUTUxNZWRpYUVsZW1lbnQ+IG1fbWVkaWFFbGVtZW50OwotICAg IFJldGFpblB0cjxQbGF0Zm9ybUxheWVyPiBtX3ZpZGVvRnVsbHNjcmVlbkxheWVyOwotICAgIGJv b2wgbV9pc0xpc3RlbmluZzsKLSAgICBXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2UqIG1fdmlk ZW9GdWxsc2NyZWVuSW50ZXJmYWNlOwotICAgIEZsb2F0UmVjdCBtX3ZpZGVvRnJhbWU7Ci0gICAg CiBwdWJsaWM6CiAgICAgV2ViVmlkZW9GdWxsc2NyZWVuTW9kZWxNZWRpYUVsZW1lbnQoKTsKICAg ICB2aXJ0dWFsIH5XZWJWaWRlb0Z1bGxzY3JlZW5Nb2RlbE1lZGlhRWxlbWVudCgpOwpAQCAtNjcs NiArNjMsMTYgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBzZXRWaWRlb0xheWVyR3Jhdml0 eShXZWJWaWRlb0Z1bGxzY3JlZW5Nb2RlbDo6VmlkZW9HcmF2aXR5KSBvdmVycmlkZTsKICAgICB2 aXJ0dWFsIHZvaWQgc2VsZWN0QXVkaW9NZWRpYU9wdGlvbih1aW50NjRfdCBpbmRleCkgb3ZlcnJp ZGU7CiAgICAgdmlydHVhbCB2b2lkIHNlbGVjdExlZ2libGVNZWRpYU9wdGlvbih1aW50NjRfdCBp bmRleCkgb3ZlcnJpZGU7CisKK3ByaXZhdGU6CisgICAgUmVmUHRyPEhUTUxNZWRpYUVsZW1lbnQ+ IG1fbWVkaWFFbGVtZW50OworICAgIFJldGFpblB0cjxQbGF0Zm9ybUxheWVyPiBtX3ZpZGVvRnVs bHNjcmVlbkxheWVyOworICAgIGJvb2wgbV9pc0xpc3RlbmluZzsKKyAgICBXZWJWaWRlb0Z1bGxz Y3JlZW5JbnRlcmZhY2UqIG1fdmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlOworICAgIEZsb2F0UmVj dCBtX3ZpZGVvRnJhbWU7CisgICAgVmVjdG9yPFJlZlB0cjxUZXh0VHJhY2s+PiBtX2xlZ2libGVU cmFja3NGb3JNZW51OworCisgICAgdm9pZCB1cGRhdGVMZWdpYmxlT3B0aW9ucygpOwogfTsKIAog fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYlZpZGVvRnVsbHNj cmVlbk1vZGVsTWVkaWFFbGVtZW50Lm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dl YlZpZGVvRnVsbHNjcmVlbk1vZGVsTWVkaWFFbGVtZW50Lm1tCmluZGV4IDEyNjAzOWM4NDFhNzEw NmQ4NTliYTU2NjNhNDM5NTNhOTFmNjBmMWQuLmQ5OTkyNGQ0YWFiMzNlNjkwMTE5MDY3M2Y2YmQx NWEzNmVkOWYzYTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJW aWRlb0Z1bGxzY3JlZW5Nb2RlbE1lZGlhRWxlbWVudC5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9pb3MvV2ViVmlkZW9GdWxsc2NyZWVuTW9kZWxNZWRpYUVsZW1lbnQubW0KQEAgLTM5 LDcgKzM5LDEwIEBACiAjaW1wb3J0IDxXZWJDb3JlL0hUTUxFbGVtZW50Lmg+CiAjaW1wb3J0IDxX ZWJDb3JlL0hUTUxNZWRpYUVsZW1lbnQuaD4KICNpbXBvcnQgPFdlYkNvcmUvSFRNTFZpZGVvRWxl bWVudC5oPgorI2ltcG9ydCA8V2ViQ29yZS9QYWdlLmg+CisjaW1wb3J0IDxXZWJDb3JlL1BhZ2VH cm91cC5oPgogI2ltcG9ydCA8V2ViQ29yZS9Tb2Z0TGlua2luZy5oPgorI2ltcG9ydCA8V2ViQ29y ZS9UZXh0VHJhY2tMaXN0Lmg+CiAjaW1wb3J0IDxXZWJDb3JlL1RpbWVSYW5nZXMuaD4KICNpbXBv cnQgPFdlYkNvcmUvV2ViQ29yZVRocmVhZFJ1bi5oPgogI2ltcG9ydCA8UXVhcnR6Q29yZS9Db3Jl QW5pbWF0aW9uLmg+CkBAIC02OCw2ICs3MSw4IEBAIHZvaWQgV2ViVmlkZW9GdWxsc2NyZWVuTW9k ZWxNZWRpYUVsZW1lbnQ6OnNldE1lZGlhRWxlbWVudChIVE1MTWVkaWFFbGVtZW50KiBtZWRpCiAg ICAgICAgIG1fbWVkaWFFbGVtZW50LT5yZW1vdmVFdmVudExpc3RlbmVyKGV2ZW50TmFtZXMoKS5w bGF5RXZlbnQsIHRoaXMsIGZhbHNlKTsKICAgICAgICAgbV9tZWRpYUVsZW1lbnQtPnJlbW92ZUV2 ZW50TGlzdGVuZXIoZXZlbnROYW1lcygpLnJhdGVjaGFuZ2VFdmVudCwgdGhpcywgZmFsc2UpOwog ICAgICAgICBtX21lZGlhRWxlbWVudC0+cmVtb3ZlRXZlbnRMaXN0ZW5lcihldmVudE5hbWVzKCku dGltZXVwZGF0ZUV2ZW50LCB0aGlzLCBmYWxzZSk7CisgICAgICAgIG1fbWVkaWFFbGVtZW50LT5y ZW1vdmVFdmVudExpc3RlbmVyKGV2ZW50TmFtZXMoKS5hZGR0cmFja0V2ZW50LCB0aGlzLCBmYWxz ZSk7CisgICAgICAgIG1fbWVkaWFFbGVtZW50LT5yZW1vdmVFdmVudExpc3RlbmVyKGV2ZW50TmFt ZXMoKS5yZW1vdmV0cmFja0V2ZW50LCB0aGlzLCBmYWxzZSk7CiAgICAgfQogICAgIG1faXNMaXN0 ZW5pbmcgPSBmYWxzZTsKIApAQCAtODEsMTkgKzg2LDE2IEBAIHZvaWQgV2ViVmlkZW9GdWxsc2Ny ZWVuTW9kZWxNZWRpYUVsZW1lbnQ6OnNldE1lZGlhRWxlbWVudChIVE1MTWVkaWFFbGVtZW50KiBt ZWRpCiAgICAgbV9tZWRpYUVsZW1lbnQtPmFkZEV2ZW50TGlzdGVuZXIoZXZlbnROYW1lcygpLnBs YXlFdmVudCwgdGhpcywgZmFsc2UpOwogICAgIG1fbWVkaWFFbGVtZW50LT5hZGRFdmVudExpc3Rl bmVyKGV2ZW50TmFtZXMoKS5yYXRlY2hhbmdlRXZlbnQsIHRoaXMsIGZhbHNlKTsKICAgICBtX21l ZGlhRWxlbWVudC0+YWRkRXZlbnRMaXN0ZW5lcihldmVudE5hbWVzKCkudGltZXVwZGF0ZUV2ZW50 LCB0aGlzLCBmYWxzZSk7CisgICAgbV9tZWRpYUVsZW1lbnQtPmFkZEV2ZW50TGlzdGVuZXIoZXZl bnROYW1lcygpLmFkZHRyYWNrRXZlbnQsIHRoaXMsIGZhbHNlKTsKKyAgICBtX21lZGlhRWxlbWVu dC0+YWRkRXZlbnRMaXN0ZW5lcihldmVudE5hbWVzKCkucmVtb3ZldHJhY2tFdmVudCwgdGhpcywg ZmFsc2UpOwogICAgIG1faXNMaXN0ZW5pbmcgPSB0cnVlOwogCiAgICAgbV92aWRlb0Z1bGxzY3Jl ZW5JbnRlcmZhY2UtPnNldER1cmF0aW9uKG1fbWVkaWFFbGVtZW50LT5kdXJhdGlvbigpKTsKICAg ICBtX3ZpZGVvRnVsbHNjcmVlbkludGVyZmFjZS0+c2V0U2Vla2FibGVSYW5nZXMoKm1fbWVkaWFF bGVtZW50LT5zZWVrYWJsZSgpKTsKICAgICBtX3ZpZGVvRnVsbHNjcmVlbkludGVyZmFjZS0+c2V0 UmF0ZSghbV9tZWRpYUVsZW1lbnQtPnBhdXNlZCgpLCBtX21lZGlhRWxlbWVudC0+cGxheWJhY2tS YXRlKCkpOwogCi0gICAgVmVjdG9yPFN0cmluZz4gbGVnaWJsZU9wdGlvbnM7Ci0gICAgCi0gICAg Zm9yIChhdXRvJiB0ZXh0VHJhY2sgOiBtX21lZGlhRWxlbWVudC0+cGxhdGZvcm1UZXh0VHJhY2tz KCkpCi0gICAgICAgIGxlZ2libGVPcHRpb25zLmFwcGVuZCh0ZXh0VHJhY2stPmxhYmVsKCkpOwot ICAgIAotICAgIG1fdmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlLT5zZXRMZWdpYmxlTWVkaWFTZWxl Y3Rpb25PcHRpb25zKGxlZ2libGVPcHRpb25zLCAwKTsKLSAgICAKKyAgICB1cGRhdGVMZWdpYmxl T3B0aW9ucygpOworCiAgICAgbV92aWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2UtPnNldEN1cnJlbnRU aW1lKG1fbWVkaWFFbGVtZW50LT5jdXJyZW50VGltZSgpLCBbW05TUHJvY2Vzc0luZm8gcHJvY2Vz c0luZm9dIHN5c3RlbVVwdGltZV0pOwogCiAgICAgaWYgKGlzSFRNTFZpZGVvRWxlbWVudChtX21l ZGlhRWxlbWVudC5nZXQoKSkpIHsKQEAgLTEyMCw3ICsxMjIsOCBAQCB2b2lkIFdlYlZpZGVvRnVs bHNjcmVlbk1vZGVsTWVkaWFFbGVtZW50OjpoYW5kbGVFdmVudChXZWJDb3JlOjpTY3JpcHRFeGVj dXRpb25DbwogICAgICAgICBtX3ZpZGVvRnVsbHNjcmVlbkludGVyZmFjZS0+c2V0Q3VycmVudFRp bWUobV9tZWRpYUVsZW1lbnQtPmN1cnJlbnRUaW1lKCksIFtbTlNQcm9jZXNzSW5mbyBwcm9jZXNz SW5mb10gc3lzdGVtVXB0aW1lXSk7CiAgICAgICAgIC8vIEZJWE1FOiAxMzA3ODggLSBmaW5kIGEg YmV0dGVyIGV2ZW50IHRvIHVwZGF0ZSBzZWVrYWJsZSByYW5nZXMgZnJvbS4KICAgICAgICAgbV92 aWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2UtPnNldFNlZWthYmxlUmFuZ2VzKCptX21lZGlhRWxlbWVu dC0+c2Vla2FibGUoKSk7Ci0gICAgfQorICAgIH0gZWxzZSBpZiAoZXZlbnQtPnR5cGUoKSA9PSBl dmVudE5hbWVzKCkuYWRkdHJhY2tFdmVudCB8fCBldmVudC0+dHlwZSgpID09IGV2ZW50TmFtZXMo KS5yZW1vdmV0cmFja0V2ZW50KQorICAgICAgICB1cGRhdGVMZWdpYmxlT3B0aW9ucygpOwogfQog CiB2b2lkIFdlYlZpZGVvRnVsbHNjcmVlbk1vZGVsTWVkaWFFbGVtZW50OjpzZXRWaWRlb0Z1bGxz Y3JlZW5MYXllcihQbGF0Zm9ybUxheWVyKiB2aWRlb0xheWVyKQpAQCAtMjEwLDEyICsyMTMsMjgg QEAgdm9pZCBXZWJWaWRlb0Z1bGxzY3JlZW5Nb2RlbE1lZGlhRWxlbWVudDo6c2VsZWN0QXVkaW9N ZWRpYU9wdGlvbih1aW50NjRfdCkKIAogdm9pZCBXZWJWaWRlb0Z1bGxzY3JlZW5Nb2RlbE1lZGlh RWxlbWVudDo6c2VsZWN0TGVnaWJsZU1lZGlhT3B0aW9uKHVpbnQ2NF90IGluZGV4KQogewotICAg IFJlZlB0cjxQbGF0Zm9ybVRleHRUcmFjaz4gcGxhdGZvcm1UcmFjazsKKyAgICBUZXh0VHJhY2sq IHRleHRUcmFjayA9IG51bGxwdHI7CiAgICAgCi0gICAgaWYgKGluZGV4IDwgbV9tZWRpYUVsZW1l bnQtPnBsYXRmb3JtVGV4dFRyYWNrcygpLnNpemUoKSkKLSAgICAgICAgcGxhdGZvcm1UcmFjayA9 IG1fbWVkaWFFbGVtZW50LT5wbGF0Zm9ybVRleHRUcmFja3MoKVtzdGF0aWNfY2FzdDxzaXplX3Q+ KGluZGV4KV07CisgICAgaWYgKGluZGV4IDwgbV9sZWdpYmxlVHJhY2tzRm9yTWVudS5zaXplKCkp CisgICAgICAgIHRleHRUcmFjayA9IG1fbGVnaWJsZVRyYWNrc0Zvck1lbnVbc3RhdGljX2Nhc3Q8 c2l6ZV90PihpbmRleCldLmdldCgpOwogICAgIAotICAgIG1fbWVkaWFFbGVtZW50LT5zZXRTZWxl Y3RlZFRleHRUcmFjayhwbGF0Zm9ybVRyYWNrKTsKKyAgICBtX21lZGlhRWxlbWVudC0+c2V0U2Vs ZWN0ZWRUZXh0VHJhY2sodGV4dFRyYWNrKTsKK30KKwordm9pZCBXZWJWaWRlb0Z1bGxzY3JlZW5N b2RlbE1lZGlhRWxlbWVudDo6dXBkYXRlTGVnaWJsZU9wdGlvbnMoKQoreworICAgIFRleHRUcmFj a0xpc3QqIHRyYWNrTGlzdCA9IG1fbWVkaWFFbGVtZW50LT50ZXh0VHJhY2tzKCk7CisgICAgaWYg KCF0cmFja0xpc3QgfHwgIXRyYWNrTGlzdC0+bGVuZ3RoKCkgfHwgIW1fbWVkaWFFbGVtZW50LT5k b2N1bWVudCgpLnBhZ2UoKSkKKyAgICAgICAgcmV0dXJuOworCisgICAgQ2FwdGlvblVzZXJQcmVm ZXJlbmNlcyYgY2FwdGlvblByZWZlcmVuY2VzID0gKm1fbWVkaWFFbGVtZW50LT5kb2N1bWVudCgp LnBhZ2UoKS0+Z3JvdXAoKS5jYXB0aW9uUHJlZmVyZW5jZXMoKTsKKyAgICBtX2xlZ2libGVUcmFj a3NGb3JNZW51ID0gY2FwdGlvblByZWZlcmVuY2VzLnNvcnRlZFRyYWNrTGlzdEZvck1lbnUodHJh Y2tMaXN0KTsKKworICAgIFZlY3RvcjxTdHJpbmc+IGxlZ2libGVPcHRpb25zOworICAgIGZvciAo YXV0byYgdHJhY2sgOiBtX2xlZ2libGVUcmFja3NGb3JNZW51KQorICAgICAgICBsZWdpYmxlT3B0 aW9ucy5hcHBlbmQoY2FwdGlvblByZWZlcmVuY2VzLmRpc3BsYXlOYW1lRm9yVHJhY2sodHJhY2su Z2V0KCkpKTsKKworICAgIG1fdmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlLT5zZXRMZWdpYmxlTWVk aWFTZWxlY3Rpb25PcHRpb25zKGxlZ2libGVPcHRpb25zLCAwKTsKIH0KIAogI2VuZGlmCg==