61578 2011-05-26 16:29:46 -0700 HTMLVideoElement::currentSrc() should return a KURL 2011-05-27 12:54:04 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 webkit.review.bot abarth abarth commit-queue darin eric.carlson eric oldest_to_newest 410979 0 webkit.review.bot 2011-05-26 16:29:46 -0700 HTMLVideoElement::currentSrc() should return a KURL Requested by abarth on #webkit. 411241 1 95132 abarth 2011-05-27 00:43:52 -0700 Created attachment 95132 Patch 411340 2 95132 menard 2011-05-27 05:11:44 -0700 Comment on attachment 95132 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=95132&action=review > Source/WebCore/html/canvas/CanvasRenderingContext.cpp:75 > + // HTMLMediaElement.currentSrc DOM API would leak redirect detinations! Typo here. > Source/WebCore/rendering/HitTestResult.cpp:315 > + return mediaElt->currentSrc(); I believe this is the same code because currentSrc has already his baseURL set. 411404 3 95132 eric 2011-05-27 07:00:12 -0700 Comment on attachment 95132 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=95132&action=review > Source/WebCore/html/HTMLMediaElement.cpp:678 > + LOG(Media, "HTMLMediaElement::loadResource(%s, %s)", urlForLogging(initialURL).utf8().data(), contentType.raw().utf8().data()); Ha. Seems urlForLogging should return a char*... >> Source/WebCore/rendering/HitTestResult.cpp:315 >> + return mediaElt->currentSrc(); > > I believe this is the same code because currentSrc has already his baseURL set. Is this tested anywhere? How do I as a reviewer know it's already absolute. :) 411533 4 abarth 2011-05-27 10:45:34 -0700 (In reply to comment #3) > (From update of attachment 95132 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=95132&action=review > > > Source/WebCore/html/HTMLMediaElement.cpp:678 > > + LOG(Media, "HTMLMediaElement::loadResource(%s, %s)", urlForLogging(initialURL).utf8().data(), contentType.raw().utf8().data()); > > Ha. Seems urlForLogging should return a char*... Very true. > >> Source/WebCore/rendering/HitTestResult.cpp:315 > >> + return mediaElt->currentSrc(); > > > > I believe this is the same code because currentSrc has already his baseURL set. > > Is this tested anywhere? How do I as a reviewer know it's already absolute. :) I'm not sure whether this is tested, but AFAIK the KURL type only holds absolute URLs, so the C++ type system (such as it is) can tell you that. :) 411539 5 95190 abarth 2011-05-27 10:51:56 -0700 Created attachment 95190 Patch for landing 411624 6 95190 commit-queue 2011-05-27 12:53:59 -0700 Comment on attachment 95190 Patch for landing Clearing flags on attachment: 95190 Committed r87539: <http://trac.webkit.org/changeset/87539> 411625 7 commit-queue 2011-05-27 12:54:04 -0700 All reviewed patches have been landed. Closing bug. 95132 2011-05-27 00:43:52 -0700 2011-05-27 10:51:53 -0700 Patch bug-61578-20110527004351.patch text/plain 8379 abarth SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg3NDgwKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzIgQEAKKzIwMTEtMDUtMjcgIEFkYW0gQmFy dGggIDxhYmFydGhAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBIVE1MVmlkZW9FbGVtZW50OjpjdXJyZW50U3JjKCkgc2hvdWxkIHJl dHVybiBhIEtVUkwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTYxNTc4CisKKyAgICAgICAgSSBzdXNwZWN0IHdlIGdvdCBpbnRvIHRoaXMgbWVzcyBiZWNh dXNlIHRoZSBhdXRob3Igb2YgdGhpcyBjb2RlIGRpZG4ndAorICAgICAgICBrbm93IGFib3V0IHRo ZSBVUkwgYXR0cmlidXRlIGluIFdlYktpdCBJREwsIHdoaWNoIGlzIHN1cGVyIHVzZWZ1bCEKKwor ICAgICAgICBCYWQgbmV3czogVGhlIGxpbmUgb2YgY29kZSBpbiBxdWVzdGlvbiBzZWVtcyB0byBo YXZlIGFub3RoZXIgYnVnLCB3aGljaAorICAgICAgICBJJ3ZlIGRvY3VtZW50ZWQgaW4gYSBGSVhN RS4gIExldCB0aGUgeWFrIHNoYXZpbmcgY29udGludWUhCisKKyAgICAgICAgKiBodG1sL0hUTUxN ZWRpYUVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6dXJsRm9yTG9nZ2luZyk6CisgICAg ICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50Ojpsb2FkUmVzb3VyY2UpOgorICAgICAgICAo V2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6aXNTYWZlVG9Mb2FkVVJMKToKKyAgICAgICAgKFdl YkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6OnNlbGVjdE5leHRTb3VyY2VDaGlsZCk6CisgICAgICAg IChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50OjpnZXRQbHVnaW5Qcm94eVBhcmFtcyk6CisgICAg ICAgICogaHRtbC9IVE1MTWVkaWFFbGVtZW50Lmg6CisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVk aWFFbGVtZW50OjpjdXJyZW50U3JjKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1l bnQ6OmN1cnJlbnRVUkwpOgorICAgICAgICAqIGh0bWwvY2FudmFzL0NhbnZhc1JlbmRlcmluZ0Nv bnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2FudmFzUmVuZGVyaW5nQ29udGV4dDo6Y2hl Y2tPcmlnaW4pOgorICAgICAgICAqIHJlbmRlcmluZy9IaXRUZXN0UmVzdWx0LmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkhpdFRlc3RSZXN1bHQ6OmFic29sdXRlTWVkaWFVUkwpOgorICAgICAgICAg ICAgLSBUaGlzIGNvbXBsZXRlIFVSTCBjYWxsIHdhcyB1bm5lY2Vzc2FyeSBiZWNhdXNlIGN1cnJl bnRTcmMgaXMKKyAgICAgICAgICAgICAgYWxyZWFkeSBhYnNvbHV0ZS4KKwogMjAxMS0wNS0yNiAg TU9SSVRBIEhhamltZSAgPG1vcnJpdGFAZ29vZ2xlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBi eSBLZW50IFRhbXVyYS4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVu dC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50 LmNwcAkocmV2aXNpb24gODc0NzkpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVs ZW1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04NSwxMyArODUsMTMgQEAgdXNpbmcgbmFtZXNw YWNlIHN0ZDsKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogI2lmICFMT0dfRElTQUJMRUQKLXN0YXRp YyBTdHJpbmcgdXJsRm9yTG9nZ2luZyhjb25zdCBTdHJpbmcmIHVybCkKK3N0YXRpYyBTdHJpbmcg dXJsRm9yTG9nZ2luZyhjb25zdCBLVVJMJiB1cmwpCiB7CiAgICAgc3RhdGljIGNvbnN0IHVuc2ln bmVkIG1heGltdW1VUkxMZW5ndGhGb3JMb2dnaW5nID0gMTI4OwogCi0gICAgaWYgKHVybC5sZW5n dGgoKSA8IG1heGltdW1VUkxMZW5ndGhGb3JMb2dnaW5nKQorICAgIGlmICh1cmwuc3RyaW5nKCku bGVuZ3RoKCkgPCBtYXhpbXVtVVJMTGVuZ3RoRm9yTG9nZ2luZykKICAgICAgICAgcmV0dXJuIHVy bDsKLSAgICByZXR1cm4gdXJsLnN1YnN0cmluZygwLCBtYXhpbXVtVVJMTGVuZ3RoRm9yTG9nZ2lu ZykgKyAiLi4uIjsKKyAgICByZXR1cm4gdXJsLnN0cmluZygpLnN1YnN0cmluZygwLCBtYXhpbXVt VVJMTGVuZ3RoRm9yTG9nZ2luZykgKyAiLi4uIjsKIH0KIAogc3RhdGljIGNvbnN0IGNoYXIgKmJv b2xTdHJpbmcoYm9vbCB2YWwpCkBAIC00NTcsMTEgKzQ1Nyw2IEBAIHZvaWQgSFRNTE1lZGlhRWxl bWVudDo6c2V0U3JjKGNvbnN0IFN0cmkKICAgICBzZXRBdHRyaWJ1dGUoc3JjQXR0ciwgdXJsKTsK IH0KIAotU3RyaW5nIEhUTUxNZWRpYUVsZW1lbnQ6OmN1cnJlbnRTcmMoKSBjb25zdAotewotICAg IHJldHVybiBtX2N1cnJlbnRTcmM7Ci19Ci0KIEhUTUxNZWRpYUVsZW1lbnQ6Ok5ldHdvcmtTdGF0 ZSBIVE1MTWVkaWFFbGVtZW50OjpuZXR3b3JrU3RhdGUoKSBjb25zdAogewogICAgIHJldHVybiBt X25ldHdvcmtTdGF0ZTsKQEAgLTY4MCw3ICs2NzUsNyBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6 OmxvYWRSZXNvdXJjZShjb25zCiB7CiAgICAgQVNTRVJUKGlzU2FmZVRvTG9hZFVSTChpbml0aWFs VVJMLCBDb21wbGFpbikpOwogCi0gICAgTE9HKE1lZGlhLCAiSFRNTE1lZGlhRWxlbWVudDo6bG9h ZFJlc291cmNlKCVzLCAlcykiLCB1cmxGb3JMb2dnaW5nKGluaXRpYWxVUkwuc3RyaW5nKCkpLnV0 ZjgoKS5kYXRhKCksIGNvbnRlbnRUeXBlLnJhdygpLnV0ZjgoKS5kYXRhKCkpOworICAgIExPRyhN ZWRpYSwgIkhUTUxNZWRpYUVsZW1lbnQ6OmxvYWRSZXNvdXJjZSglcywgJXMpIiwgdXJsRm9yTG9n Z2luZyhpbml0aWFsVVJMKS51dGY4KCkuZGF0YSgpLCBjb250ZW50VHlwZS5yYXcoKS51dGY4KCku ZGF0YSgpKTsKIAogICAgIEZyYW1lKiBmcmFtZSA9IGRvY3VtZW50KCktPmZyYW1lKCk7CiAgICAg aWYgKCFmcmFtZSkKQEAgLTcxMiw3ICs3MDcsNyBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6Omxv YWRSZXNvdXJjZShjb25zCiAgICAgbV9wbGF5ZXItPnNldFByZXNlcnZlc1BpdGNoKG1fd2Via2l0 UHJlc2VydmVzUGl0Y2gpOwogICAgIHVwZGF0ZVZvbHVtZSgpOwogCi0gICAgbV9wbGF5ZXItPmxv YWQobV9jdXJyZW50U3JjLCBjb250ZW50VHlwZSk7CisgICAgbV9wbGF5ZXItPmxvYWQobV9jdXJy ZW50U3JjLnN0cmluZygpLCBjb250ZW50VHlwZSk7CiAKICAgICAvLyBJZiB0aGVyZSBpcyBubyBw b3N0ZXIgdG8gZGlzcGxheSwgYWxsb3cgdGhlIG1lZGlhIGVuZ2luZSB0byByZW5kZXIgdmlkZW8g ZnJhbWVzIGFzIHNvb24gYXMKICAgICAvLyB0aGV5IGFyZSBhdmFpbGFibGUuCkBAIC03MjUsNyAr NzIwLDcgQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50Ojpsb2FkUmVzb3VyY2UoY29ucwogYm9vbCBI VE1MTWVkaWFFbGVtZW50Ojppc1NhZmVUb0xvYWRVUkwoY29uc3QgS1VSTCYgdXJsLCBJbnZhbGlk U291cmNlQWN0aW9uIGFjdGlvbklmSW52YWxpZCkKIHsKICAgICBpZiAoIXVybC5pc1ZhbGlkKCkp IHsKLSAgICAgICAgTE9HKE1lZGlhLCAiSFRNTE1lZGlhRWxlbWVudDo6aXNTYWZlVG9Mb2FkVVJM KCVzKSAtPiBGQUxTRSBiZWNhdXNlIHVybCBpcyBpbnZhbGlkIiwgdXJsRm9yTG9nZ2luZyh1cmwu c3RyaW5nKCkpLnV0ZjgoKS5kYXRhKCkpOworICAgICAgICBMT0coTWVkaWEsICJIVE1MTWVkaWFF bGVtZW50Ojppc1NhZmVUb0xvYWRVUkwoJXMpIC0+IEZBTFNFIGJlY2F1c2UgdXJsIGlzIGludmFs aWQiLCB1cmxGb3JMb2dnaW5nKHVybCkudXRmOCgpLmRhdGEoKSk7CiAgICAgICAgIHJldHVybiBm YWxzZTsKICAgICB9CiAKQEAgLTczMyw3ICs3MjgsNyBAQCBib29sIEhUTUxNZWRpYUVsZW1lbnQ6 OmlzU2FmZVRvTG9hZFVSTChjCiAgICAgaWYgKCFmcmFtZSB8fCAhZG9jdW1lbnQoKS0+c2VjdXJp dHlPcmlnaW4oKS0+Y2FuRGlzcGxheSh1cmwpKSB7CiAgICAgICAgIGlmIChhY3Rpb25JZkludmFs aWQgPT0gQ29tcGxhaW4pCiAgICAgICAgICAgICBGcmFtZUxvYWRlcjo6cmVwb3J0TG9jYWxMb2Fk RmFpbGVkKGZyYW1lLCB1cmwuc3RyaW5nKCkpOwotICAgICAgICBMT0coTWVkaWEsICJIVE1MTWVk aWFFbGVtZW50Ojppc1NhZmVUb0xvYWRVUkwoJXMpIC0+IEZBTFNFIHJlamVjdGVkIGJ5IFNlY3Vy aXR5T3JpZ2luIiwgdXJsRm9yTG9nZ2luZyh1cmwuc3RyaW5nKCkpLnV0ZjgoKS5kYXRhKCkpOwor ICAgICAgICBMT0coTWVkaWEsICJIVE1MTWVkaWFFbGVtZW50Ojppc1NhZmVUb0xvYWRVUkwoJXMp IC0+IEZBTFNFIHJlamVjdGVkIGJ5IFNlY3VyaXR5T3JpZ2luIiwgdXJsRm9yTG9nZ2luZyh1cmwp LnV0ZjgoKS5kYXRhKCkpOwogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQogCkBAIC0xNzg3 LDcgKzE3ODIsNyBAQCBjaGVja19hZ2FpbjoKIAogI2lmICFMT0dfRElTQUJMRUQKICAgICBpZiAo c2hvdWxkTG9nKQotICAgICAgICBMT0coTWVkaWEsICJIVE1MTWVkaWFFbGVtZW50OjpzZWxlY3RO ZXh0U291cmNlQ2hpbGQgLT4gJXAsICVzIiwgbV9jdXJyZW50U291cmNlTm9kZSwgY2FuVXNlID8g dXJsRm9yTG9nZ2luZyhtZWRpYVVSTC5zdHJpbmcoKSkudXRmOCgpLmRhdGEoKSA6ICIiKTsKKyAg ICAgICAgTE9HKE1lZGlhLCAiSFRNTE1lZGlhRWxlbWVudDo6c2VsZWN0TmV4dFNvdXJjZUNoaWxk IC0+ICVwLCAlcyIsIG1fY3VycmVudFNvdXJjZU5vZGUsIGNhblVzZSA/IHVybEZvckxvZ2dpbmco bWVkaWFVUkwpLnV0ZjgoKS5kYXRhKCkgOiAiIik7CiAjZW5kaWYKICAgICByZXR1cm4gY2FuVXNl ID8gbWVkaWFVUkwgOiBLVVJMKCk7CiB9CkBAIC0yNDUwLDEwICsyNDQ1LDEwIEBAIHZvaWQgSFRN TE1lZGlhRWxlbWVudDo6Z2V0UGx1Z2luUHJveHlQYXIKICAgICBpZiAoIWlzU2FmZVRvTG9hZFVS TCh1cmwsIENvbXBsYWluKSkKICAgICAgICAgdXJsID0gc2VsZWN0TmV4dFNvdXJjZUNoaWxkKDAs IERvTm90aGluZyk7CiAKLSAgICBtX2N1cnJlbnRTcmMgPSB1cmwuc3RyaW5nKCk7CisgICAgbV9j dXJyZW50U3JjID0gdXJsOwogICAgIGlmICh1cmwuaXNWYWxpZCgpICYmIGZyYW1lICYmIGZyYW1l LT5sb2FkZXIoKS0+d2lsbExvYWRNZWRpYUVsZW1lbnRVUkwodXJsKSkgewogICAgICAgICBuYW1l cy5hcHBlbmQoIl9tZWRpYV9lbGVtZW50X3NyY18iKTsKLSAgICAgICAgdmFsdWVzLmFwcGVuZCht X2N1cnJlbnRTcmMpOworICAgICAgICB2YWx1ZXMuYXBwZW5kKG1fY3VycmVudFNyYy5zdHJpbmco KSk7CiAgICAgfQogfQogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1l bnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQu aAkocmV2aXNpb24gODc0NzMpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1l bnQuaAkod29ya2luZyBjb3B5KQpAQCAtODYsNyArODYsNyBAQCBwdWJsaWM6CiAKIC8vIG5ldHdv cmsgc3RhdGUKICAgICB2b2lkIHNldFNyYyhjb25zdCBTdHJpbmcmKTsKLSAgICBTdHJpbmcgY3Vy cmVudFNyYygpIGNvbnN0OworICAgIGNvbnN0IEtVUkwmIGN1cnJlbnRTcmMoKSBjb25zdCB7IHJl dHVybiBtX2N1cnJlbnRTcmM7IH0KIAogICAgIGVudW0gTmV0d29ya1N0YXRlIHsgTkVUV09SS19F TVBUWSwgTkVUV09SS19JRExFLCBORVRXT1JLX0xPQURJTkcsIE5FVFdPUktfTk9fU09VUkNFIH07 CiAgICAgTmV0d29ya1N0YXRlIG5ldHdvcmtTdGF0ZSgpIGNvbnN0OwpAQCAtMzQ3LDggKzM0Nyw4 IEBAIHByaXZhdGU6CiAgICAgTmV0d29ya1N0YXRlIG1fbmV0d29ya1N0YXRlOwogICAgIFJlYWR5 U3RhdGUgbV9yZWFkeVN0YXRlOwogICAgIFJlYWR5U3RhdGUgbV9yZWFkeVN0YXRlTWF4aW11bTsK LSAgICBTdHJpbmcgbV9jdXJyZW50U3JjOwotICAgIAorICAgIEtVUkwgbV9jdXJyZW50U3JjOwor CiAgICAgUmVmUHRyPE1lZGlhRXJyb3I+IG1fZXJyb3I7CiAKICAgICBmbG9hdCBtX3ZvbHVtZTsK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5pZGwKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmlkbAkocmV2aXNpb24g ODc0NzMpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuaWRsCSh3b3Jr aW5nIGNvcHkpCkBAIC0zMSw3ICszMSw3IEBAIGludGVyZmFjZSBbQ29uZGl0aW9uYWw9VklERU9d IEhUTUxNZWRpYUUKIAogICAgIC8vIG5ldHdvcmsgc3RhdGUKICAgICBhdHRyaWJ1dGUgW1JlZmxl Y3QsIFVSTF0gRE9NU3RyaW5nIHNyYzsKLSAgICByZWFkb25seSBhdHRyaWJ1dGUgRE9NU3RyaW5n IGN1cnJlbnRTcmM7CisgICAgcmVhZG9ubHkgYXR0cmlidXRlIFtVUkxdIERPTVN0cmluZyBjdXJy ZW50U3JjOwogICAgIAogICAgIGNvbnN0IHVuc2lnbmVkIHNob3J0IE5FVFdPUktfRU1QVFkgPSAw OwogICAgIGNvbnN0IHVuc2lnbmVkIHNob3J0IE5FVFdPUktfSURMRSA9IDE7CkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9odG1sL2NhbnZhcy9DYW52YXNSZW5kZXJpbmdDb250ZXh0LmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9DYW52YXNSZW5kZXJpbmdDb250ZXh0 LmNwcAkocmV2aXNpb24gODc0NzMpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9DYW52 YXNSZW5kZXJpbmdDb250ZXh0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjksOSArNjksMTEgQEAg dm9pZCBDYW52YXNSZW5kZXJpbmdDb250ZXh0OjpjaGVja09yaWdpbgogdm9pZCBDYW52YXNSZW5k ZXJpbmdDb250ZXh0OjpjaGVja09yaWdpbihjb25zdCBIVE1MVmlkZW9FbGVtZW50KiB2aWRlbykK IHsKICNpZiBFTkFCTEUoVklERU8pCi0gICAgLy8gRklYTUU6IEhUTUxWaWRlb0VsZW1lbnQ6OmN1 cnJlbnRTcmMoKSBzaG91bGQgcmV0dXJuIGEgS1VSTC4KLSAgICAvLyBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjE1NzgKLSAgICBjaGVja09yaWdpbihLVVJMKFBhcnNl ZFVSTFN0cmluZywgdmlkZW8tPmN1cnJlbnRTcmMoKSkpOworICAgIC8vIEZJWE1FOiBUaGlzIGNo ZWNrIGlzIGxpa2VseSB3cm9uZyB3aGVuIGEgcmVkaXJlY3QgaXMgaW52b2x2ZWQuIFdlIG5lZWQK KyAgICAvLyB0byB0ZXN0IHRoZSBmaW5hbFVSTC4gUGxlYXNlIGJlIGNhcmVmdWwgd2hlbiBmaXhp bmcgdGhpcyBpc3N1ZSBub3QgdG8KKyAgICAvLyBtYWtlIGN1cnJlbnRTcmMgYmUgdGhlIGZpbmFs IFVSTCBiZWNhdXNlIHRoZW4gdGhlCisgICAgLy8gSFRNTE1lZGlhRWxlbWVudC5jdXJyZW50U3Jj IERPTSBBUEkgd291bGQgbGVhayByZWRpcmVjdCBkZXRpbmF0aW9ucyEKKyAgICBjaGVja09yaWdp bih2aWRlby0+Y3VycmVudFNyYygpKTsKICAgICBpZiAoY2FudmFzKCktPm9yaWdpbkNsZWFuKCkg JiYgdmlkZW8gJiYgIXZpZGVvLT5oYXNTaW5nbGVTZWN1cml0eU9yaWdpbigpKQogICAgICAgICBj YW52YXMoKS0+c2V0T3JpZ2luVGFpbnRlZCgpOwogI2VuZGlmCkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvSGl0VGVzdFJlc3VsdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL0hpdFRlc3RSZXN1bHQuY3BwCShyZXZpc2lvbiA4NzQ3MykKKysrIFNvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9IaXRUZXN0UmVzdWx0LmNwcAkod29ya2luZyBjb3B5KQpAQCAt MzEyLDcgKzMxMiw3IEBAIEtVUkwgSGl0VGVzdFJlc3VsdDo6YWJzb2x1dGVNZWRpYVVSTCgpIGMK IHsKICNpZiBFTkFCTEUoVklERU8pCiAgICAgaWYgKEhUTUxNZWRpYUVsZW1lbnQqIG1lZGlhRWx0 ID0gbWVkaWFFbGVtZW50KCkpCi0gICAgICAgIHJldHVybiBtX2lubmVyTm9uU2hhcmVkTm9kZS0+ ZG9jdW1lbnQoKS0+Y29tcGxldGVVUkwoc3RyaXBMZWFkaW5nQW5kVHJhaWxpbmdIVE1MU3BhY2Vz KG1lZGlhRWx0LT5jdXJyZW50U3JjKCkpKTsKKyAgICAgICAgcmV0dXJuIG1lZGlhRWx0LT5jdXJy ZW50U3JjKCk7CiAgICAgcmV0dXJuIEtVUkwoKTsKICNlbHNlCiAgICAgcmV0dXJuIEtVUkwoKTsK 95190 2011-05-27 10:51:56 -0700 2011-05-27 12:53:59 -0700 Patch for landing bug-61578-20110527105155.patch text/plain 10131 abarth SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg3NDgwKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzIgQEAKKzIwMTEtMDUtMjcgIEFkYW0gQmFy dGggIDxhYmFydGhAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBFcmljIFNlaWRl bC4KKworICAgICAgICBIVE1MVmlkZW9FbGVtZW50OjpjdXJyZW50U3JjKCkgc2hvdWxkIHJldHVy biBhIEtVUkwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTYxNTc4CisKKyAgICAgICAgSSBzdXNwZWN0IHdlIGdvdCBpbnRvIHRoaXMgbWVzcyBiZWNhdXNl IHRoZSBhdXRob3Igb2YgdGhpcyBjb2RlIGRpZG4ndAorICAgICAgICBrbm93IGFib3V0IHRoZSBV UkwgYXR0cmlidXRlIGluIFdlYktpdCBJREwsIHdoaWNoIGlzIHN1cGVyIHVzZWZ1bCEKKworICAg ICAgICBCYWQgbmV3czogVGhlIGxpbmUgb2YgY29kZSBpbiBxdWVzdGlvbiBzZWVtcyB0byBoYXZl IGFub3RoZXIgYnVnLCB3aGljaAorICAgICAgICBJJ3ZlIGRvY3VtZW50ZWQgaW4gYSBGSVhNRS4g IExldCB0aGUgeWFrIHNoYXZpbmcgY29udGludWUhCisKKyAgICAgICAgKiBodG1sL0hUTUxNZWRp YUVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6dXJsRm9yTG9nZ2luZyk6CisgICAgICAg IChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50Ojpsb2FkUmVzb3VyY2UpOgorICAgICAgICAoV2Vi Q29yZTo6SFRNTE1lZGlhRWxlbWVudDo6aXNTYWZlVG9Mb2FkVVJMKToKKyAgICAgICAgKFdlYkNv cmU6OkhUTUxNZWRpYUVsZW1lbnQ6OnNlbGVjdE5leHRTb3VyY2VDaGlsZCk6CisgICAgICAgIChX ZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50OjpnZXRQbHVnaW5Qcm94eVBhcmFtcyk6CisgICAgICAg ICogaHRtbC9IVE1MTWVkaWFFbGVtZW50Lmg6CisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFF bGVtZW50OjpjdXJyZW50U3JjKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6 OmN1cnJlbnRVUkwpOgorICAgICAgICAqIGh0bWwvY2FudmFzL0NhbnZhc1JlbmRlcmluZ0NvbnRl eHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2FudmFzUmVuZGVyaW5nQ29udGV4dDo6Y2hlY2tP cmlnaW4pOgorICAgICAgICAqIHJlbmRlcmluZy9IaXRUZXN0UmVzdWx0LmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkhpdFRlc3RSZXN1bHQ6OmFic29sdXRlTWVkaWFVUkwpOgorICAgICAgICAgICAg LSBUaGlzIGNvbXBsZXRlIFVSTCBjYWxsIHdhcyB1bm5lY2Vzc2FyeSBiZWNhdXNlIGN1cnJlbnRT cmMgaXMKKyAgICAgICAgICAgICAgYWxyZWFkeSBhYnNvbHV0ZS4KKwogMjAxMS0wNS0yNiAgTU9S SVRBIEhhamltZSAgPG1vcnJpdGFAZ29vZ2xlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBL ZW50IFRhbXVyYS4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNw cAkocmV2aXNpb24gODc0NzkpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1l bnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04NSwxNiArODUsMTYgQEAgdXNpbmcgbmFtZXNwYWNl IHN0ZDsKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogI2lmICFMT0dfRElTQUJMRUQKLXN0YXRpYyBT dHJpbmcgdXJsRm9yTG9nZ2luZyhjb25zdCBTdHJpbmcmIHVybCkKK3N0YXRpYyBjb25zdCBjaGFy KiB1cmxGb3JMb2dnaW5nKGNvbnN0IEtVUkwmIHVybCkKIHsKICAgICBzdGF0aWMgY29uc3QgdW5z aWduZWQgbWF4aW11bVVSTExlbmd0aEZvckxvZ2dpbmcgPSAxMjg7CiAKLSAgICBpZiAodXJsLmxl bmd0aCgpIDwgbWF4aW11bVVSTExlbmd0aEZvckxvZ2dpbmcpCi0gICAgICAgIHJldHVybiB1cmw7 Ci0gICAgcmV0dXJuIHVybC5zdWJzdHJpbmcoMCwgbWF4aW11bVVSTExlbmd0aEZvckxvZ2dpbmcp ICsgIi4uLiI7CisgICAgaWYgKHVybC5zdHJpbmcoKS5sZW5ndGgoKSA8IG1heGltdW1VUkxMZW5n dGhGb3JMb2dnaW5nKQorICAgICAgICByZXR1cm4gdXJsLnN0cmluZygpLnV0ZjgoKS5kYXRhKCk7 CisgICAgcmV0dXJuIFN0cmluZyh1cmwuc3RyaW5nKCkuc3Vic3RyaW5nKDAsIG1heGltdW1VUkxM ZW5ndGhGb3JMb2dnaW5nKSArICIuLi4iKS51dGY4KCkuZGF0YSgpOwogfQogCi1zdGF0aWMgY29u c3QgY2hhciAqYm9vbFN0cmluZyhib29sIHZhbCkKK3N0YXRpYyBjb25zdCBjaGFyKiBib29sU3Ry aW5nKGJvb2wgdmFsKQogewogICAgIHJldHVybiB2YWwgPyAidHJ1ZSIgOiAiZmFsc2UiOwogfQpA QCAtNDU3LDExICs0NTcsNiBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OnNldFNyYyhjb25zdCBT dHJpCiAgICAgc2V0QXR0cmlidXRlKHNyY0F0dHIsIHVybCk7CiB9CiAKLVN0cmluZyBIVE1MTWVk aWFFbGVtZW50OjpjdXJyZW50U3JjKCkgY29uc3QKLXsKLSAgICByZXR1cm4gbV9jdXJyZW50U3Jj OwotfQotCiBIVE1MTWVkaWFFbGVtZW50OjpOZXR3b3JrU3RhdGUgSFRNTE1lZGlhRWxlbWVudDo6 bmV0d29ya1N0YXRlKCkgY29uc3QKIHsKICAgICByZXR1cm4gbV9uZXR3b3JrU3RhdGU7CkBAIC02 ODAsNyArNjc1LDcgQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50Ojpsb2FkUmVzb3VyY2UoY29ucwog ewogICAgIEFTU0VSVChpc1NhZmVUb0xvYWRVUkwoaW5pdGlhbFVSTCwgQ29tcGxhaW4pKTsKIAot ICAgIExPRyhNZWRpYSwgIkhUTUxNZWRpYUVsZW1lbnQ6OmxvYWRSZXNvdXJjZSglcywgJXMpIiwg dXJsRm9yTG9nZ2luZyhpbml0aWFsVVJMLnN0cmluZygpKS51dGY4KCkuZGF0YSgpLCBjb250ZW50 VHlwZS5yYXcoKS51dGY4KCkuZGF0YSgpKTsKKyAgICBMT0coTWVkaWEsICJIVE1MTWVkaWFFbGVt ZW50Ojpsb2FkUmVzb3VyY2UoJXMsICVzKSIsIHVybEZvckxvZ2dpbmcoaW5pdGlhbFVSTCksIGNv bnRlbnRUeXBlLnJhdygpLnV0ZjgoKS5kYXRhKCkpOwogCiAgICAgRnJhbWUqIGZyYW1lID0gZG9j dW1lbnQoKS0+ZnJhbWUoKTsKICAgICBpZiAoIWZyYW1lKQpAQCAtNjk1LDcgKzY5MCw3IEBAIHZv aWQgSFRNTE1lZGlhRWxlbWVudDo6bG9hZFJlc291cmNlKGNvbnMKIAogICAgIG1fY3VycmVudFNy YyA9IHVybDsKIAotICAgIExPRyhNZWRpYSwgIkhUTUxNZWRpYUVsZW1lbnQ6OmxvYWRSZXNvdXJj ZSAtIG1fY3VycmVudFNyYyAtPiAlcyIsIHVybEZvckxvZ2dpbmcobV9jdXJyZW50U3JjKS51dGY4 KCkuZGF0YSgpKTsKKyAgICBMT0coTWVkaWEsICJIVE1MTWVkaWFFbGVtZW50Ojpsb2FkUmVzb3Vy Y2UgLSBtX2N1cnJlbnRTcmMgLT4gJXMiLCB1cmxGb3JMb2dnaW5nKG1fY3VycmVudFNyYykpOwog CiAgICAgaWYgKG1fc2VuZFByb2dyZXNzRXZlbnRzKSAKICAgICAgICAgc3RhcnRQcm9ncmVzc0V2 ZW50VGltZXIoKTsKQEAgLTcxMiw3ICs3MDcsNyBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6Omxv YWRSZXNvdXJjZShjb25zCiAgICAgbV9wbGF5ZXItPnNldFByZXNlcnZlc1BpdGNoKG1fd2Via2l0 UHJlc2VydmVzUGl0Y2gpOwogICAgIHVwZGF0ZVZvbHVtZSgpOwogCi0gICAgbV9wbGF5ZXItPmxv YWQobV9jdXJyZW50U3JjLCBjb250ZW50VHlwZSk7CisgICAgbV9wbGF5ZXItPmxvYWQobV9jdXJy ZW50U3JjLnN0cmluZygpLCBjb250ZW50VHlwZSk7CiAKICAgICAvLyBJZiB0aGVyZSBpcyBubyBw b3N0ZXIgdG8gZGlzcGxheSwgYWxsb3cgdGhlIG1lZGlhIGVuZ2luZSB0byByZW5kZXIgdmlkZW8g ZnJhbWVzIGFzIHNvb24gYXMKICAgICAvLyB0aGV5IGFyZSBhdmFpbGFibGUuCkBAIC03MjUsNyAr NzIwLDcgQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50Ojpsb2FkUmVzb3VyY2UoY29ucwogYm9vbCBI VE1MTWVkaWFFbGVtZW50Ojppc1NhZmVUb0xvYWRVUkwoY29uc3QgS1VSTCYgdXJsLCBJbnZhbGlk U291cmNlQWN0aW9uIGFjdGlvbklmSW52YWxpZCkKIHsKICAgICBpZiAoIXVybC5pc1ZhbGlkKCkp IHsKLSAgICAgICAgTE9HKE1lZGlhLCAiSFRNTE1lZGlhRWxlbWVudDo6aXNTYWZlVG9Mb2FkVVJM KCVzKSAtPiBGQUxTRSBiZWNhdXNlIHVybCBpcyBpbnZhbGlkIiwgdXJsRm9yTG9nZ2luZyh1cmwu c3RyaW5nKCkpLnV0ZjgoKS5kYXRhKCkpOworICAgICAgICBMT0coTWVkaWEsICJIVE1MTWVkaWFF bGVtZW50Ojppc1NhZmVUb0xvYWRVUkwoJXMpIC0+IEZBTFNFIGJlY2F1c2UgdXJsIGlzIGludmFs aWQiLCB1cmxGb3JMb2dnaW5nKHVybCkpOwogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQog CkBAIC03MzMsNyArNzI4LDcgQEAgYm9vbCBIVE1MTWVkaWFFbGVtZW50Ojppc1NhZmVUb0xvYWRV UkwoYwogICAgIGlmICghZnJhbWUgfHwgIWRvY3VtZW50KCktPnNlY3VyaXR5T3JpZ2luKCktPmNh bkRpc3BsYXkodXJsKSkgewogICAgICAgICBpZiAoYWN0aW9uSWZJbnZhbGlkID09IENvbXBsYWlu KQogICAgICAgICAgICAgRnJhbWVMb2FkZXI6OnJlcG9ydExvY2FsTG9hZEZhaWxlZChmcmFtZSwg dXJsLnN0cmluZygpKTsKLSAgICAgICAgTE9HKE1lZGlhLCAiSFRNTE1lZGlhRWxlbWVudDo6aXNT YWZlVG9Mb2FkVVJMKCVzKSAtPiBGQUxTRSByZWplY3RlZCBieSBTZWN1cml0eU9yaWdpbiIsIHVy bEZvckxvZ2dpbmcodXJsLnN0cmluZygpKS51dGY4KCkuZGF0YSgpKTsKKyAgICAgICAgTE9HKE1l ZGlhLCAiSFRNTE1lZGlhRWxlbWVudDo6aXNTYWZlVG9Mb2FkVVJMKCVzKSAtPiBGQUxTRSByZWpl Y3RlZCBieSBTZWN1cml0eU9yaWdpbiIsIHVybEZvckxvZ2dpbmcodXJsKSk7CiAgICAgICAgIHJl dHVybiBmYWxzZTsKICAgICB9CiAKQEAgLTE3MzYsNyArMTczMSw3IEBAIEtVUkwgSFRNTE1lZGlh RWxlbWVudDo6c2VsZWN0TmV4dFNvdXJjZUMKICAgICAgICAgbWVkaWFVUkwgPSBzb3VyY2UtPmdl dE5vbkVtcHR5VVJMQXR0cmlidXRlKHNyY0F0dHIpOwogI2lmICFMT0dfRElTQUJMRUQKICAgICAg ICAgaWYgKHNob3VsZExvZykKLSAgICAgICAgICAgIExPRyhNZWRpYSwgIkhUTUxNZWRpYUVsZW1l bnQ6OnNlbGVjdE5leHRTb3VyY2VDaGlsZCAtICdzcmMnIGlzICVzIiwgdXJsRm9yTG9nZ2luZyht ZWRpYVVSTCkudXRmOCgpLmRhdGEoKSk7CisgICAgICAgICAgICBMT0coTWVkaWEsICJIVE1MTWVk aWFFbGVtZW50OjpzZWxlY3ROZXh0U291cmNlQ2hpbGQgLSAnc3JjJyBpcyAlcyIsIHVybEZvckxv Z2dpbmcobWVkaWFVUkwpKTsKICNlbmRpZgogICAgICAgICBpZiAobWVkaWFVUkwuaXNFbXB0eSgp KQogICAgICAgICAgICAgZ290byBjaGVja19hZ2FpbjsKQEAgLTE3ODcsNyArMTc4Miw3IEBAIGNo ZWNrX2FnYWluOgogCiAjaWYgIUxPR19ESVNBQkxFRAogICAgIGlmIChzaG91bGRMb2cpCi0gICAg ICAgIExPRyhNZWRpYSwgIkhUTUxNZWRpYUVsZW1lbnQ6OnNlbGVjdE5leHRTb3VyY2VDaGlsZCAt PiAlcCwgJXMiLCBtX2N1cnJlbnRTb3VyY2VOb2RlLCBjYW5Vc2UgPyB1cmxGb3JMb2dnaW5nKG1l ZGlhVVJMLnN0cmluZygpKS51dGY4KCkuZGF0YSgpIDogIiIpOworICAgICAgICBMT0coTWVkaWEs ICJIVE1MTWVkaWFFbGVtZW50OjpzZWxlY3ROZXh0U291cmNlQ2hpbGQgLT4gJXAsICVzIiwgbV9j dXJyZW50U291cmNlTm9kZSwgY2FuVXNlID8gdXJsRm9yTG9nZ2luZyhtZWRpYVVSTCkgOiAiIik7 CiAjZW5kaWYKICAgICByZXR1cm4gY2FuVXNlID8gbWVkaWFVUkwgOiBLVVJMKCk7CiB9CkBAIC0x Nzk5LDcgKzE3OTQsNyBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OnNvdXJjZVdhc0FkZGVkKEhU CiAjaWYgIUxPR19ESVNBQkxFRAogICAgIGlmIChzb3VyY2UtPmhhc1RhZ05hbWUoc291cmNlVGFn KSkgewogICAgICAgICBLVVJMIHVybCA9IHNvdXJjZS0+Z2V0Tm9uRW1wdHlVUkxBdHRyaWJ1dGUo c3JjQXR0cik7Ci0gICAgICAgIExPRyhNZWRpYSwgIkhUTUxNZWRpYUVsZW1lbnQ6OnNvdXJjZVdh c0FkZGVkIC0gJ3NyYycgaXMgJXMiLCB1cmxGb3JMb2dnaW5nKHVybCkudXRmOCgpLmRhdGEoKSk7 CisgICAgICAgIExPRyhNZWRpYSwgIkhUTUxNZWRpYUVsZW1lbnQ6OnNvdXJjZVdhc0FkZGVkIC0g J3NyYycgaXMgJXMiLCB1cmxGb3JMb2dnaW5nKHVybCkpOwogICAgIH0KICNlbmRpZgogICAgIApA QCAtMTg0Niw3ICsxODQxLDcgQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50Ojpzb3VyY2VXaWxsQmVS ZW1vdgogI2lmICFMT0dfRElTQUJMRUQKICAgICBpZiAoc291cmNlLT5oYXNUYWdOYW1lKHNvdXJj ZVRhZykpIHsKICAgICAgICAgS1VSTCB1cmwgPSBzb3VyY2UtPmdldE5vbkVtcHR5VVJMQXR0cmli dXRlKHNyY0F0dHIpOwotICAgICAgICBMT0coTWVkaWEsICJIVE1MTWVkaWFFbGVtZW50Ojpzb3Vy Y2VXaWxsQmVSZW1vdmVkIC0gJ3NyYycgaXMgJXMiLCB1cmxGb3JMb2dnaW5nKHVybCkudXRmOCgp LmRhdGEoKSk7CisgICAgICAgIExPRyhNZWRpYSwgIkhUTUxNZWRpYUVsZW1lbnQ6OnNvdXJjZVdp bGxCZVJlbW92ZWQgLSAnc3JjJyBpcyAlcyIsIHVybEZvckxvZ2dpbmcodXJsKSk7CiAgICAgfQog I2VuZGlmCiAKQEAgLTI0NTAsMTAgKzI0NDUsMTAgQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50Ojpn ZXRQbHVnaW5Qcm94eVBhcgogICAgIGlmICghaXNTYWZlVG9Mb2FkVVJMKHVybCwgQ29tcGxhaW4p KQogICAgICAgICB1cmwgPSBzZWxlY3ROZXh0U291cmNlQ2hpbGQoMCwgRG9Ob3RoaW5nKTsKIAot ICAgIG1fY3VycmVudFNyYyA9IHVybC5zdHJpbmcoKTsKKyAgICBtX2N1cnJlbnRTcmMgPSB1cmw7 CiAgICAgaWYgKHVybC5pc1ZhbGlkKCkgJiYgZnJhbWUgJiYgZnJhbWUtPmxvYWRlcigpLT53aWxs TG9hZE1lZGlhRWxlbWVudFVSTCh1cmwpKSB7CiAgICAgICAgIG5hbWVzLmFwcGVuZCgiX21lZGlh X2VsZW1lbnRfc3JjXyIpOwotICAgICAgICB2YWx1ZXMuYXBwZW5kKG1fY3VycmVudFNyYyk7Cisg ICAgICAgIHZhbHVlcy5hcHBlbmQobV9jdXJyZW50U3JjLnN0cmluZygpKTsKICAgICB9CiB9CiAK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5oCShyZXZpc2lvbiA4NzQ3 MykKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5oCSh3b3JraW5nIGNv cHkpCkBAIC04Niw3ICs4Niw3IEBAIHB1YmxpYzoKIAogLy8gbmV0d29yayBzdGF0ZQogICAgIHZv aWQgc2V0U3JjKGNvbnN0IFN0cmluZyYpOwotICAgIFN0cmluZyBjdXJyZW50U3JjKCkgY29uc3Q7 CisgICAgY29uc3QgS1VSTCYgY3VycmVudFNyYygpIGNvbnN0IHsgcmV0dXJuIG1fY3VycmVudFNy YzsgfQogCiAgICAgZW51bSBOZXR3b3JrU3RhdGUgeyBORVRXT1JLX0VNUFRZLCBORVRXT1JLX0lE TEUsIE5FVFdPUktfTE9BRElORywgTkVUV09SS19OT19TT1VSQ0UgfTsKICAgICBOZXR3b3JrU3Rh dGUgbmV0d29ya1N0YXRlKCkgY29uc3Q7CkBAIC0zNDcsOCArMzQ3LDggQEAgcHJpdmF0ZToKICAg ICBOZXR3b3JrU3RhdGUgbV9uZXR3b3JrU3RhdGU7CiAgICAgUmVhZHlTdGF0ZSBtX3JlYWR5U3Rh dGU7CiAgICAgUmVhZHlTdGF0ZSBtX3JlYWR5U3RhdGVNYXhpbXVtOwotICAgIFN0cmluZyBtX2N1 cnJlbnRTcmM7Ci0gICAgCisgICAgS1VSTCBtX2N1cnJlbnRTcmM7CisKICAgICBSZWZQdHI8TWVk aWFFcnJvcj4gbV9lcnJvcjsKIAogICAgIGZsb2F0IG1fdm9sdW1lOwpJbmRleDogU291cmNlL1dl YkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmlkbAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuaWRsCShyZXZpc2lvbiA4NzQ3MykKKysrIFNvdXJj ZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5pZGwJKHdvcmtpbmcgY29weSkKQEAgLTMx LDcgKzMxLDcgQEAgaW50ZXJmYWNlIFtDb25kaXRpb25hbD1WSURFT10gSFRNTE1lZGlhRQogCiAg ICAgLy8gbmV0d29yayBzdGF0ZQogICAgIGF0dHJpYnV0ZSBbUmVmbGVjdCwgVVJMXSBET01TdHJp bmcgc3JjOwotICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSBET01TdHJpbmcgY3VycmVudFNyYzsKKyAg ICByZWFkb25seSBhdHRyaWJ1dGUgW1VSTF0gRE9NU3RyaW5nIGN1cnJlbnRTcmM7CiAgICAgCiAg ICAgY29uc3QgdW5zaWduZWQgc2hvcnQgTkVUV09SS19FTVBUWSA9IDA7CiAgICAgY29uc3QgdW5z aWduZWQgc2hvcnQgTkVUV09SS19JRExFID0gMTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwv Y2FudmFzL0NhbnZhc1JlbmRlcmluZ0NvbnRleHQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL2h0bWwvY2FudmFzL0NhbnZhc1JlbmRlcmluZ0NvbnRleHQuY3BwCShyZXZpc2lvbiA4 NzQ3MykKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL0NhbnZhc1JlbmRlcmluZ0NvbnRl eHQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02OSw5ICs2OSwxMSBAQCB2b2lkIENhbnZhc1JlbmRl cmluZ0NvbnRleHQ6OmNoZWNrT3JpZ2luCiB2b2lkIENhbnZhc1JlbmRlcmluZ0NvbnRleHQ6OmNo ZWNrT3JpZ2luKGNvbnN0IEhUTUxWaWRlb0VsZW1lbnQqIHZpZGVvKQogewogI2lmIEVOQUJMRShW SURFTykKLSAgICAvLyBGSVhNRTogSFRNTFZpZGVvRWxlbWVudDo6Y3VycmVudFNyYygpIHNob3Vs ZCByZXR1cm4gYSBLVVJMLgotICAgIC8vIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD02MTU3OAotICAgIGNoZWNrT3JpZ2luKEtVUkwoUGFyc2VkVVJMU3RyaW5nLCB2aWRl by0+Y3VycmVudFNyYygpKSk7CisgICAgLy8gRklYTUU6IFRoaXMgY2hlY2sgaXMgbGlrZWx5IHdy b25nIHdoZW4gYSByZWRpcmVjdCBpcyBpbnZvbHZlZC4gV2UgbmVlZAorICAgIC8vIHRvIHRlc3Qg dGhlIGZpbmFsVVJMLiBQbGVhc2UgYmUgY2FyZWZ1bCB3aGVuIGZpeGluZyB0aGlzIGlzc3VlIG5v dCB0bworICAgIC8vIG1ha2UgY3VycmVudFNyYyBiZSB0aGUgZmluYWwgVVJMIGJlY2F1c2UgdGhl biB0aGUKKyAgICAvLyBIVE1MTWVkaWFFbGVtZW50LmN1cnJlbnRTcmMgRE9NIEFQSSB3b3VsZCBs ZWFrIHJlZGlyZWN0IGRlc3RpbmF0aW9ucyEKKyAgICBjaGVja09yaWdpbih2aWRlby0+Y3VycmVu dFNyYygpKTsKICAgICBpZiAoY2FudmFzKCktPm9yaWdpbkNsZWFuKCkgJiYgdmlkZW8gJiYgIXZp ZGVvLT5oYXNTaW5nbGVTZWN1cml0eU9yaWdpbigpKQogICAgICAgICBjYW52YXMoKS0+c2V0T3Jp Z2luVGFpbnRlZCgpOwogI2VuZGlmCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSGl0 VGVzdFJlc3VsdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0hp dFRlc3RSZXN1bHQuY3BwCShyZXZpc2lvbiA4NzQ3MykKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9IaXRUZXN0UmVzdWx0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzEyLDcgKzMxMiw3IEBA IEtVUkwgSGl0VGVzdFJlc3VsdDo6YWJzb2x1dGVNZWRpYVVSTCgpIGMKIHsKICNpZiBFTkFCTEUo VklERU8pCiAgICAgaWYgKEhUTUxNZWRpYUVsZW1lbnQqIG1lZGlhRWx0ID0gbWVkaWFFbGVtZW50 KCkpCi0gICAgICAgIHJldHVybiBtX2lubmVyTm9uU2hhcmVkTm9kZS0+ZG9jdW1lbnQoKS0+Y29t cGxldGVVUkwoc3RyaXBMZWFkaW5nQW5kVHJhaWxpbmdIVE1MU3BhY2VzKG1lZGlhRWx0LT5jdXJy ZW50U3JjKCkpKTsKKyAgICAgICAgcmV0dXJuIG1lZGlhRWx0LT5jdXJyZW50U3JjKCk7CiAgICAg cmV0dXJuIEtVUkwoKTsKICNlbHNlCiAgICAgcmV0dXJuIEtVUkwoKTsK