107404 2013-01-20 14:14:46 -0800 Fix a race condition on SkBitmap::lockPixels()/unlockPixels() for lazy image decoding 2013-01-22 13:10:40 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 qinmin webkit-unassigned cc-bugs hclam jamesr levin+threading nduca senorblanco webkit.review.bot oldest_to_newest 811677 0 qinmin 2013-01-20 14:14:46 -0800 Fix a race condition on SkBitmap::lockPixels()/unlockPixels() for lazy image decoding 811678 1 183685 qinmin 2013-01-20 14:17:39 -0800 Created attachment 183685 Patch 812144 2 183685 senorblanco 2013-01-21 07:50:56 -0800 Comment on attachment 183685 Patch This looks OK to me, but I'll wait for hclam to take a look. 813117 3 183685 hclam 2013-01-22 10:03:37 -0800 Comment on attachment 183685 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=183685&action=review > Source/WebCore/platform/graphics/chromium/ImageDecodingStore.cpp:135 > + image->bitmap().lockPixels(); Make this call after line 147 so you don't need to take lock here. 813118 4 183685 hclam 2013-01-22 10:03:39 -0800 Comment on attachment 183685 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=183685&action=review > Source/WebCore/platform/graphics/chromium/ImageDecodingStore.cpp:135 > + image->bitmap().lockPixels(); Make this call after line 147 so you don't need to take lock here. 813174 5 184014 qinmin 2013-01-22 10:45:37 -0800 Created attachment 184014 Patch 813176 6 183685 qinmin 2013-01-22 10:46:36 -0800 Comment on attachment 183685 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=183685&action=review >>> Source/WebCore/platform/graphics/chromium/ImageDecodingStore.cpp:135 >>> + image->bitmap().lockPixels(); >> >> Make this call after line 147 so you don't need to take lock here. > > Make this call after line 147 so you don't need to take lock here. Done 813182 7 184014 hclam 2013-01-22 10:47:47 -0800 Comment on attachment 184014 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=184014&action=review > Source/WebCore/platform/graphics/chromium/ImageDecodingStore.cpp:143 > + image->bitmap().lockPixels(); image is NULL at this point. So this should be cachedImage->bitmap().lockPixels(). 813184 8 hclam 2013-01-22 10:48:06 -0800 After the fix then lgtm. 813196 9 184018 qinmin 2013-01-22 10:52:31 -0800 Created attachment 184018 Patch 813198 10 184014 qinmin 2013-01-22 10:53:31 -0800 Comment on attachment 184014 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=184014&action=review >> Source/WebCore/platform/graphics/chromium/ImageDecodingStore.cpp:143 >> + image->bitmap().lockPixels(); > > image is NULL at this point. So this should be cachedImage->bitmap().lockPixels(). ah...Didn't notice that CreateAndUse() will take the OwnPtr away. Fixed. 813205 11 184018 senorblanco 2013-01-22 10:55:58 -0800 Comment on attachment 184018 Patch Transitively OK. r=me 813259 12 184018 webkit.review.bot 2013-01-22 11:30:26 -0800 Comment on attachment 184018 Patch Rejecting attachment 184018 from commit-queue. New failing tests: inspector-protocol/debugger-terminate-dedicated-worker-while-paused.html Full output: http://queues.webkit.org/results/16063133 813331 13 184018 wangxianzhu 2013-01-22 13:02:46 -0800 Comment on attachment 184018 Patch Last cq was rejected because of unrelated flakyness. Try again. 813337 14 184018 webkit.review.bot 2013-01-22 13:10:36 -0800 Comment on attachment 184018 Patch Clearing flags on attachment: 184018 Committed r140454: <http://trac.webkit.org/changeset/140454> 813338 15 webkit.review.bot 2013-01-22 13:10:40 -0800 All reviewed patches have been landed. Closing bug. 183685 2013-01-20 14:17:39 -0800 2013-01-22 10:46:36 -0800 Patch bug-107404-20130120141436.patch text/plain 5222 qinmin U3VidmVyc2lvbiBSZXZpc2lvbjogMTQwMjgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzExZjRjYzYwMTdkZWYy OThlNTczNjU1ZTA1ZmQ3OWY5MjgzYzJlZS4uZDQ5ZGEyMDY3N2NlOWI5MGZkZGNlZmFkMDViNTVj NjhiYWZlODk0ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEzLTAxLTIwICBNaW4g UWluICA8cWlubWluQGNocm9taXVtLm9yZz4KKworICAgICAgICBGaXggYSByYWNlIGNvbmRpdGlv biBvbiBTa0JpdG1hcDo6bG9ja1BpeGVscygpL3VubG9ja1BpeGVscygpIGZvciBsYXp5IGltYWdl IGRlY29kaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMDc0MDQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBTa2JpdG1hcDo6bG9ja1BpeGVscygpL3VubG9ja1BpeGVscygpIGFyZSBub3QgdGhyZWFkc2Fm ZS4KKyAgICAgICAgdW5saWtlIFNrUGl4ZWxSZWYsIHRoZXNlIDIgY2FsbHMgYXJlIG5vdCBwcm90 ZWN0ZWQgYnkgYW4gaW50ZXJuYWwgbXV0ZXguCisgICAgICAgIEJ1Z2ZpeCwgbm8gYmVoYXZpcmFs IGNoYW5nZSBhbmQgaGFyZCB0byB0ZXN0IGFzIHRlc3RzIHdpbGwgYmUgZmxha3kuCisKKyAgICAg ICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9JbWFnZURlY29kaW5nU3RvcmUuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6SW1hZ2VEZWNvZGluZ1N0b3JlOjpsb2NrQ2FjaGUpOgorICAgICAg ICAoV2ViQ29yZTo6SW1hZ2VEZWNvZGluZ1N0b3JlOjp1bmxvY2tDYWNoZSk6CisgICAgICAgIChX ZWJDb3JlOjpJbWFnZURlY29kaW5nU3RvcmU6Omluc2VydEFuZExvY2tDYWNoZSk6CisgICAgICAg IChXZWJDb3JlOjpJbWFnZURlY29kaW5nU3RvcmU6Om92ZXJ3cml0ZUFuZExvY2tDYWNoZSk6Cisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vSW1hZ2VEZWNvZGluZ1N0b3JlLmg6 CisgICAgICAgIChJbWFnZURlY29kaW5nU3RvcmUpOgorCiAyMDEzLTAxLTIwICBTaW1vbiBGcmFz ZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIEF2b2lkIGZpbGxpbmcgYSBy b3VuZGVkIHJlY3Qgd2hlbiByYWRpaSBhcmUgemVybwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vSW1hZ2VEZWNvZGluZ1N0b3JlLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ltYWdlRGVjb2RpbmdTdG9y ZS5jcHAKaW5kZXggNTk5MmM1MDAzZDE4YTZkMDQyNDI1M2RiMWFlNzA5ODdmZWJmNjE2ZC4uMGQ2 OGJhMzhmMmE3NDY2YjYxMzUzZTk2YzMxZmUyZmRjYTBkZGUyNyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vSW1hZ2VEZWNvZGluZ1N0b3JlLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9JbWFnZURl Y29kaW5nU3RvcmUuY3BwCkBAIC05NiwyMyArOTYsMjMgQEAgYm9vbCBJbWFnZURlY29kaW5nU3Rv cmU6OmxvY2tDYWNoZShjb25zdCBJbWFnZUZyYW1lR2VuZXJhdG9yKiBnZW5lcmF0b3IsIGNvbnN0 IFMKIAogICAgICAgICAvLyBJbmNyZW1lbnQgdXNlIGNvdW50IHN1Y2ggdGhhdCBpdCBkb2Vzbid0 IGdldCBldmljdGVkLgogICAgICAgICBjYWNoZUVudHJ5LT5pbmNyZW1lbnRVc2VDb3VudCgpOwot ICAgIH0KIAotICAgIC8vIENvbXBsZXRlIGNhY2hlIGVudHJ5IGRvZXNuJ3QgaGF2ZSBhIGRlY29k ZXIuCi0gICAgQVNTRVJUKCFjYWNoZUVudHJ5LT5jYWNoZWRJbWFnZSgpLT5pc0NvbXBsZXRlKCkg fHwgIWNhY2hlRW50cnktPmNhY2hlZERlY29kZXIoKSk7CisgICAgICAgIC8vIENvbXBsZXRlIGNh Y2hlIGVudHJ5IGRvZXNuJ3QgaGF2ZSBhIGRlY29kZXIuCisgICAgICAgIEFTU0VSVCghY2FjaGVF bnRyeS0+Y2FjaGVkSW1hZ2UoKS0+aXNDb21wbGV0ZSgpIHx8ICFjYWNoZUVudHJ5LT5jYWNoZWRE ZWNvZGVyKCkpOworCisgICAgICAgIGlmIChkZWNvZGVyKQorICAgICAgICAgICAgKmRlY29kZXIg PSBjYWNoZUVudHJ5LT5jYWNoZWREZWNvZGVyKCk7CisgICAgICAgICpjYWNoZWRJbWFnZSA9IGNh Y2hlRW50cnktPmNhY2hlZEltYWdlKCk7CisgICAgICAgICgqY2FjaGVkSW1hZ2UpLT5iaXRtYXAo KS5sb2NrUGl4ZWxzKCk7CisgICAgfQogCi0gICAgaWYgKGRlY29kZXIpCi0gICAgICAgICpkZWNv ZGVyID0gY2FjaGVFbnRyeS0+Y2FjaGVkRGVjb2RlcigpOwotICAgICpjYWNoZWRJbWFnZSA9IGNh Y2hlRW50cnktPmNhY2hlZEltYWdlKCk7Ci0gICAgKCpjYWNoZWRJbWFnZSktPmJpdG1hcCgpLmxv Y2tQaXhlbHMoKTsKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAogdm9pZCBJbWFnZURlY29kaW5nU3Rv cmU6OnVubG9ja0NhY2hlKGNvbnN0IEltYWdlRnJhbWVHZW5lcmF0b3IqIGdlbmVyYXRvciwgY29u c3QgU2NhbGVkSW1hZ2VGcmFnbWVudCogY2FjaGVkSW1hZ2UpCiB7Ci0gICAgY2FjaGVkSW1hZ2Ut PmJpdG1hcCgpLnVubG9ja1BpeGVscygpOwotCiAgICAgTXV0ZXhMb2NrZXIgbG9jayhtX211dGV4 KTsKKyAgICBjYWNoZWRJbWFnZS0+Yml0bWFwKCkudW5sb2NrUGl4ZWxzKCk7CiAgICAgQ2FjaGVN YXA6Oml0ZXJhdG9yIGl0ZXIgPSBtX2NhY2hlTWFwLmZpbmQoc3RkOjptYWtlX3BhaXIoZ2VuZXJh dG9yLCBjYWNoZWRJbWFnZS0+c2NhbGVkU2l6ZSgpKSk7CiAgICAgQVNTRVJUKGl0ZXIgIT0gbV9j YWNoZU1hcC5lbmQoKSk7CiAKQEAgLTEyOSw4ICsxMjksMTEgQEAgY29uc3QgU2NhbGVkSW1hZ2VG cmFnbWVudCogSW1hZ2VEZWNvZGluZ1N0b3JlOjppbnNlcnRBbmRMb2NrQ2FjaGUoY29uc3QgSW1h Z2VGcmEKICAgICAvLyBQcnVuZSBvbGQgY2FjaGUgZW50cmllcyB0byBnaXZlIHNwYWNlIGZvciB0 aGUgbmV3IG9uZS4KICAgICBwcnVuZSgpOwogCi0gICAgLy8gTG9jayB0aGUgdW5kZXJseWluZyBT a0JpdG1hcCB0byBwcmV2ZW50IGl0IGZyb20gYmVpbmcgcHVyZ2VkLgotICAgIGltYWdlLT5iaXRt YXAoKS5sb2NrUGl4ZWxzKCk7CisgICAgeworICAgICAgICBNdXRleExvY2tlciBsb2NrKG1fbXV0 ZXgpOworICAgICAgICAvLyBMb2NrIHRoZSB1bmRlcmx5aW5nIFNrQml0bWFwIHRvIHByZXZlbnQg aXQgZnJvbSBiZWluZyBwdXJnZWQuCisgICAgICAgIGltYWdlLT5iaXRtYXAoKS5sb2NrUGl4ZWxz KCk7CisgICAgfQogCiAgICAgU2NhbGVkSW1hZ2VGcmFnbWVudCogY2FjaGVkSW1hZ2UgPSBpbWFn ZS5nZXQoKTsKICAgICBPd25QdHI8Q2FjaGVFbnRyeT4gbmV3Q2FjaGVFbnRyeTsKQEAgLTE0OSwx MiArMTUyLDExIEBAIGNvbnN0IFNjYWxlZEltYWdlRnJhZ21lbnQqIEltYWdlRGVjb2RpbmdTdG9y ZTo6aW5zZXJ0QW5kTG9ja0NhY2hlKGNvbnN0IEltYWdlRnJhCiAKIGNvbnN0IFNjYWxlZEltYWdl RnJhZ21lbnQqIEltYWdlRGVjb2RpbmdTdG9yZTo6b3ZlcndyaXRlQW5kTG9ja0NhY2hlKGNvbnN0 IEltYWdlRnJhbWVHZW5lcmF0b3IqIGdlbmVyYXRvciwgY29uc3QgU2NhbGVkSW1hZ2VGcmFnbWVu dCogY2FjaGVkSW1hZ2UsIFBhc3NPd25QdHI8U2NhbGVkSW1hZ2VGcmFnbWVudD4gbmV3SW1hZ2Up CiB7Ci0gICAgY2FjaGVkSW1hZ2UtPmJpdG1hcCgpLnVubG9ja1BpeGVscygpOwotCiAgICAgT3du UHRyPEltYWdlRGVjb2Rlcj4gdHJhc2g7CiAgICAgY29uc3QgU2NhbGVkSW1hZ2VGcmFnbWVudCog bmV3Q2FjaGVkSW1hZ2UgPSAwOwogICAgIHsKICAgICAgICAgTXV0ZXhMb2NrZXIgbG9jayhtX211 dGV4KTsKKyAgICAgICAgY2FjaGVkSW1hZ2UtPmJpdG1hcCgpLnVubG9ja1BpeGVscygpOwogICAg ICAgICBDYWNoZU1hcDo6aXRlcmF0b3IgaXRlciA9IG1fY2FjaGVNYXAuZmluZChzdGQ6Om1ha2Vf cGFpcihnZW5lcmF0b3IsIGNhY2hlZEltYWdlLT5zY2FsZWRTaXplKCkpKTsKICAgICAgICAgQVNT RVJUKGl0ZXIgIT0gbV9jYWNoZU1hcC5lbmQoKSk7CiAKQEAgLTE2NCwxMCArMTY2LDEwIEBAIGNv bnN0IFNjYWxlZEltYWdlRnJhZ21lbnQqIEltYWdlRGVjb2RpbmdTdG9yZTo6b3ZlcndyaXRlQW5k TG9ja0NhY2hlKGNvbnN0IEltYWdlCiAKICAgICAgICAgdHJhc2ggPSBjYWNoZUVudHJ5LT5vdmVy d3JpdGVDYWNoZWRJbWFnZShuZXdJbWFnZSk7CiAgICAgICAgIG5ld0NhY2hlZEltYWdlID0gY2Fj aGVFbnRyeS0+Y2FjaGVkSW1hZ2UoKTsKKyAgICAgICAgLy8gTG9jayB0aGUgdW5kZXJseWluZyBT a0JpdG1hcCB0byBwcmV2ZW50IGl0IGZyb20gYmVpbmcgcHVyZ2VkLgorICAgICAgICBuZXdDYWNo ZWRJbWFnZS0+Yml0bWFwKCkubG9ja1BpeGVscygpOwogICAgIH0KIAotICAgIC8vIExvY2sgdGhl IHVuZGVybHlpbmcgU2tCaXRtYXAgdG8gcHJldmVudCBpdCBmcm9tIGJlaW5nIHB1cmdlZC4KLSAg ICBuZXdDYWNoZWRJbWFnZS0+Yml0bWFwKCkubG9ja1BpeGVscygpOwogICAgIHJldHVybiBuZXdD YWNoZWRJbWFnZTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2hyb21pdW0vSW1hZ2VEZWNvZGluZ1N0b3JlLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9JbWFnZURlY29kaW5nU3RvcmUuaAppbmRleCA1ZjFmYjI4 YWViNDBiOTI0NWRjZDhjODI3ZTI4NmY3ODI0YmJiZjc3Li5lYWFjNDNhYzk5M2QzYzlhZDlmMmVj NjgxZWE1MjA0NDBiNGI2YWEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9JbWFnZURlY29kaW5nU3RvcmUuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9JbWFnZURlY29kaW5nU3RvcmUuaApAQCAtMTYz LDYgKzE2Myw4IEBAIHByaXZhdGU6CiAgICAgLy8gICBtX2NhY2hlZFNpemVNYXAKICAgICAvLyAg IG1fY2FjaGVMaW1pdEluQnl0ZXMKICAgICAvLyAgIG1fbWVtb3J5VXNhZ2VJbkJ5dGVzCisgICAg Ly8gVGhpcyBtdXRleCBhbHNvIHByb3RlY3RzIGNhbGxzIHRvIHVuZGVybHlpbmcgc2tCaXRtYXAn cworICAgIC8vIGxvY2tQaXhlbHMoKS91bmxvY2tQaXhlbHMoKSBhcyB0aGV5IGFyZSBub3QgdGhy ZWFkc2FmZS4KICAgICBNdXRleCBtX211dGV4OwogfTsKIAo= 184014 2013-01-22 10:45:37 -0800 2013-01-22 10:53:31 -0800 Patch bug-107404-20130122104231.patch text/plain 5516 qinmin U3VidmVyc2lvbiBSZXZpc2lvbjogMTQwMjgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzExZjRjYzYwMTdkZWYy OThlNTczNjU1ZTA1ZmQ3OWY5MjgzYzJlZS4uZDQ5ZGEyMDY3N2NlOWI5MGZkZGNlZmFkMDViNTVj NjhiYWZlODk0ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEzLTAxLTIwICBNaW4g UWluICA8cWlubWluQGNocm9taXVtLm9yZz4KKworICAgICAgICBGaXggYSByYWNlIGNvbmRpdGlv biBvbiBTa0JpdG1hcDo6bG9ja1BpeGVscygpL3VubG9ja1BpeGVscygpIGZvciBsYXp5IGltYWdl IGRlY29kaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMDc0MDQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBTa2JpdG1hcDo6bG9ja1BpeGVscygpL3VubG9ja1BpeGVscygpIGFyZSBub3QgdGhyZWFkc2Fm ZS4KKyAgICAgICAgdW5saWtlIFNrUGl4ZWxSZWYsIHRoZXNlIDIgY2FsbHMgYXJlIG5vdCBwcm90 ZWN0ZWQgYnkgYW4gaW50ZXJuYWwgbXV0ZXguCisgICAgICAgIEJ1Z2ZpeCwgbm8gYmVoYXZpcmFs IGNoYW5nZSBhbmQgaGFyZCB0byB0ZXN0IGFzIHRlc3RzIHdpbGwgYmUgZmxha3kuCisKKyAgICAg ICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9JbWFnZURlY29kaW5nU3RvcmUuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6SW1hZ2VEZWNvZGluZ1N0b3JlOjpsb2NrQ2FjaGUpOgorICAgICAg ICAoV2ViQ29yZTo6SW1hZ2VEZWNvZGluZ1N0b3JlOjp1bmxvY2tDYWNoZSk6CisgICAgICAgIChX ZWJDb3JlOjpJbWFnZURlY29kaW5nU3RvcmU6Omluc2VydEFuZExvY2tDYWNoZSk6CisgICAgICAg IChXZWJDb3JlOjpJbWFnZURlY29kaW5nU3RvcmU6Om92ZXJ3cml0ZUFuZExvY2tDYWNoZSk6Cisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vSW1hZ2VEZWNvZGluZ1N0b3JlLmg6 CisgICAgICAgIChJbWFnZURlY29kaW5nU3RvcmUpOgorCiAyMDEzLTAxLTIwICBTaW1vbiBGcmFz ZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIEF2b2lkIGZpbGxpbmcgYSBy b3VuZGVkIHJlY3Qgd2hlbiByYWRpaSBhcmUgemVybwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vSW1hZ2VEZWNvZGluZ1N0b3JlLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ltYWdlRGVjb2RpbmdTdG9y ZS5jcHAKaW5kZXggNTk5MmM1MDAzZDE4YTZkMDQyNDI1M2RiMWFlNzA5ODdmZWJmNjE2ZC4uM2M3 ZDg0ZGU1ZGU1M2I3NzgzNTBmMDZiOTAxYzFhNDgwZjVhNjdjYiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vSW1hZ2VEZWNvZGluZ1N0b3JlLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9JbWFnZURl Y29kaW5nU3RvcmUuY3BwCkBAIC05NiwyMyArOTYsMjMgQEAgYm9vbCBJbWFnZURlY29kaW5nU3Rv cmU6OmxvY2tDYWNoZShjb25zdCBJbWFnZUZyYW1lR2VuZXJhdG9yKiBnZW5lcmF0b3IsIGNvbnN0 IFMKIAogICAgICAgICAvLyBJbmNyZW1lbnQgdXNlIGNvdW50IHN1Y2ggdGhhdCBpdCBkb2Vzbid0 IGdldCBldmljdGVkLgogICAgICAgICBjYWNoZUVudHJ5LT5pbmNyZW1lbnRVc2VDb3VudCgpOwot ICAgIH0KIAotICAgIC8vIENvbXBsZXRlIGNhY2hlIGVudHJ5IGRvZXNuJ3QgaGF2ZSBhIGRlY29k ZXIuCi0gICAgQVNTRVJUKCFjYWNoZUVudHJ5LT5jYWNoZWRJbWFnZSgpLT5pc0NvbXBsZXRlKCkg fHwgIWNhY2hlRW50cnktPmNhY2hlZERlY29kZXIoKSk7CisgICAgICAgIC8vIENvbXBsZXRlIGNh Y2hlIGVudHJ5IGRvZXNuJ3QgaGF2ZSBhIGRlY29kZXIuCisgICAgICAgIEFTU0VSVCghY2FjaGVF bnRyeS0+Y2FjaGVkSW1hZ2UoKS0+aXNDb21wbGV0ZSgpIHx8ICFjYWNoZUVudHJ5LT5jYWNoZWRE ZWNvZGVyKCkpOworCisgICAgICAgIGlmIChkZWNvZGVyKQorICAgICAgICAgICAgKmRlY29kZXIg PSBjYWNoZUVudHJ5LT5jYWNoZWREZWNvZGVyKCk7CisgICAgICAgICpjYWNoZWRJbWFnZSA9IGNh Y2hlRW50cnktPmNhY2hlZEltYWdlKCk7CisgICAgICAgICgqY2FjaGVkSW1hZ2UpLT5iaXRtYXAo KS5sb2NrUGl4ZWxzKCk7CisgICAgfQogCi0gICAgaWYgKGRlY29kZXIpCi0gICAgICAgICpkZWNv ZGVyID0gY2FjaGVFbnRyeS0+Y2FjaGVkRGVjb2RlcigpOwotICAgICpjYWNoZWRJbWFnZSA9IGNh Y2hlRW50cnktPmNhY2hlZEltYWdlKCk7Ci0gICAgKCpjYWNoZWRJbWFnZSktPmJpdG1hcCgpLmxv Y2tQaXhlbHMoKTsKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAogdm9pZCBJbWFnZURlY29kaW5nU3Rv cmU6OnVubG9ja0NhY2hlKGNvbnN0IEltYWdlRnJhbWVHZW5lcmF0b3IqIGdlbmVyYXRvciwgY29u c3QgU2NhbGVkSW1hZ2VGcmFnbWVudCogY2FjaGVkSW1hZ2UpCiB7Ci0gICAgY2FjaGVkSW1hZ2Ut PmJpdG1hcCgpLnVubG9ja1BpeGVscygpOwotCiAgICAgTXV0ZXhMb2NrZXIgbG9jayhtX211dGV4 KTsKKyAgICBjYWNoZWRJbWFnZS0+Yml0bWFwKCkudW5sb2NrUGl4ZWxzKCk7CiAgICAgQ2FjaGVN YXA6Oml0ZXJhdG9yIGl0ZXIgPSBtX2NhY2hlTWFwLmZpbmQoc3RkOjptYWtlX3BhaXIoZ2VuZXJh dG9yLCBjYWNoZWRJbWFnZS0+c2NhbGVkU2l6ZSgpKSk7CiAgICAgQVNTRVJUKGl0ZXIgIT0gbV9j YWNoZU1hcC5lbmQoKSk7CiAKQEAgLTEyOSw5ICsxMjksNiBAQCBjb25zdCBTY2FsZWRJbWFnZUZy YWdtZW50KiBJbWFnZURlY29kaW5nU3RvcmU6Omluc2VydEFuZExvY2tDYWNoZShjb25zdCBJbWFn ZUZyYQogICAgIC8vIFBydW5lIG9sZCBjYWNoZSBlbnRyaWVzIHRvIGdpdmUgc3BhY2UgZm9yIHRo ZSBuZXcgb25lLgogICAgIHBydW5lKCk7CiAKLSAgICAvLyBMb2NrIHRoZSB1bmRlcmx5aW5nIFNr Qml0bWFwIHRvIHByZXZlbnQgaXQgZnJvbSBiZWluZyBwdXJnZWQuCi0gICAgaW1hZ2UtPmJpdG1h cCgpLmxvY2tQaXhlbHMoKTsKLQogICAgIFNjYWxlZEltYWdlRnJhZ21lbnQqIGNhY2hlZEltYWdl ID0gaW1hZ2UuZ2V0KCk7CiAgICAgT3duUHRyPENhY2hlRW50cnk+IG5ld0NhY2hlRW50cnk7CiAK QEAgLTE0Miw2ICsxMzksOCBAQCBjb25zdCBTY2FsZWRJbWFnZUZyYWdtZW50KiBJbWFnZURlY29k aW5nU3RvcmU6Omluc2VydEFuZExvY2tDYWNoZShjb25zdCBJbWFnZUZyYQogICAgICAgICBuZXdD YWNoZUVudHJ5ID0gQ2FjaGVFbnRyeTo6Y3JlYXRlQW5kVXNlKGdlbmVyYXRvciwgaW1hZ2UsIGRl Y29kZXIpOwogCiAgICAgTXV0ZXhMb2NrZXIgbG9jayhtX211dGV4KTsKKyAgICAvLyBMb2NrIHRo ZSB1bmRlcmx5aW5nIFNrQml0bWFwIHRvIHByZXZlbnQgaXQgZnJvbSBiZWluZyBwdXJnZWQuCisg ICAgaW1hZ2UtPmJpdG1hcCgpLmxvY2tQaXhlbHMoKTsKICAgICBBU1NFUlQoIW1fY2FjaGVNYXAu Y29udGFpbnMobmV3Q2FjaGVFbnRyeS0+Y2FjaGVLZXkoKSkpOwogICAgIGluc2VydENhY2hlSW50 ZXJuYWwobmV3Q2FjaGVFbnRyeS5yZWxlYXNlKCkpOwogICAgIHJldHVybiBjYWNoZWRJbWFnZTsK QEAgLTE0OSwxMiArMTQ4LDExIEBAIGNvbnN0IFNjYWxlZEltYWdlRnJhZ21lbnQqIEltYWdlRGVj b2RpbmdTdG9yZTo6aW5zZXJ0QW5kTG9ja0NhY2hlKGNvbnN0IEltYWdlRnJhCiAKIGNvbnN0IFNj YWxlZEltYWdlRnJhZ21lbnQqIEltYWdlRGVjb2RpbmdTdG9yZTo6b3ZlcndyaXRlQW5kTG9ja0Nh Y2hlKGNvbnN0IEltYWdlRnJhbWVHZW5lcmF0b3IqIGdlbmVyYXRvciwgY29uc3QgU2NhbGVkSW1h Z2VGcmFnbWVudCogY2FjaGVkSW1hZ2UsIFBhc3NPd25QdHI8U2NhbGVkSW1hZ2VGcmFnbWVudD4g bmV3SW1hZ2UpCiB7Ci0gICAgY2FjaGVkSW1hZ2UtPmJpdG1hcCgpLnVubG9ja1BpeGVscygpOwot CiAgICAgT3duUHRyPEltYWdlRGVjb2Rlcj4gdHJhc2g7CiAgICAgY29uc3QgU2NhbGVkSW1hZ2VG cmFnbWVudCogbmV3Q2FjaGVkSW1hZ2UgPSAwOwogICAgIHsKICAgICAgICAgTXV0ZXhMb2NrZXIg bG9jayhtX211dGV4KTsKKyAgICAgICAgY2FjaGVkSW1hZ2UtPmJpdG1hcCgpLnVubG9ja1BpeGVs cygpOwogICAgICAgICBDYWNoZU1hcDo6aXRlcmF0b3IgaXRlciA9IG1fY2FjaGVNYXAuZmluZChz dGQ6Om1ha2VfcGFpcihnZW5lcmF0b3IsIGNhY2hlZEltYWdlLT5zY2FsZWRTaXplKCkpKTsKICAg ICAgICAgQVNTRVJUKGl0ZXIgIT0gbV9jYWNoZU1hcC5lbmQoKSk7CiAKQEAgLTE2NCwxMCArMTYy LDEwIEBAIGNvbnN0IFNjYWxlZEltYWdlRnJhZ21lbnQqIEltYWdlRGVjb2RpbmdTdG9yZTo6b3Zl cndyaXRlQW5kTG9ja0NhY2hlKGNvbnN0IEltYWdlCiAKICAgICAgICAgdHJhc2ggPSBjYWNoZUVu dHJ5LT5vdmVyd3JpdGVDYWNoZWRJbWFnZShuZXdJbWFnZSk7CiAgICAgICAgIG5ld0NhY2hlZElt YWdlID0gY2FjaGVFbnRyeS0+Y2FjaGVkSW1hZ2UoKTsKKyAgICAgICAgLy8gTG9jayB0aGUgdW5k ZXJseWluZyBTa0JpdG1hcCB0byBwcmV2ZW50IGl0IGZyb20gYmVpbmcgcHVyZ2VkLgorICAgICAg ICBuZXdDYWNoZWRJbWFnZS0+Yml0bWFwKCkubG9ja1BpeGVscygpOwogICAgIH0KIAotICAgIC8v IExvY2sgdGhlIHVuZGVybHlpbmcgU2tCaXRtYXAgdG8gcHJldmVudCBpdCBmcm9tIGJlaW5nIHB1 cmdlZC4KLSAgICBuZXdDYWNoZWRJbWFnZS0+Yml0bWFwKCkubG9ja1BpeGVscygpOwogICAgIHJl dHVybiBuZXdDYWNoZWRJbWFnZTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vSW1hZ2VEZWNvZGluZ1N0b3JlLmggYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9JbWFnZURlY29kaW5nU3RvcmUuaAppbmRl eCA1ZjFmYjI4YWViNDBiOTI0NWRjZDhjODI3ZTI4NmY3ODI0YmJiZjc3Li5lYWFjNDNhYzk5M2Qz YzlhZDlmMmVjNjgxZWE1MjA0NDBiNGI2YWEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9JbWFnZURlY29kaW5nU3RvcmUuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9JbWFnZURlY29kaW5nU3RvcmUu aApAQCAtMTYzLDYgKzE2Myw4IEBAIHByaXZhdGU6CiAgICAgLy8gICBtX2NhY2hlZFNpemVNYXAK ICAgICAvLyAgIG1fY2FjaGVMaW1pdEluQnl0ZXMKICAgICAvLyAgIG1fbWVtb3J5VXNhZ2VJbkJ5 dGVzCisgICAgLy8gVGhpcyBtdXRleCBhbHNvIHByb3RlY3RzIGNhbGxzIHRvIHVuZGVybHlpbmcg c2tCaXRtYXAncworICAgIC8vIGxvY2tQaXhlbHMoKS91bmxvY2tQaXhlbHMoKSBhcyB0aGV5IGFy ZSBub3QgdGhyZWFkc2FmZS4KICAgICBNdXRleCBtX211dGV4OwogfTsKIAo= 184018 2013-01-22 10:52:31 -0800 2013-01-22 13:10:36 -0800 Patch bug-107404-20130122104925.patch text/plain 5522 qinmin U3VidmVyc2lvbiBSZXZpc2lvbjogMTQwMjgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzExZjRjYzYwMTdkZWYy OThlNTczNjU1ZTA1ZmQ3OWY5MjgzYzJlZS4uZDQ5ZGEyMDY3N2NlOWI5MGZkZGNlZmFkMDViNTVj NjhiYWZlODk0ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEzLTAxLTIwICBNaW4g UWluICA8cWlubWluQGNocm9taXVtLm9yZz4KKworICAgICAgICBGaXggYSByYWNlIGNvbmRpdGlv biBvbiBTa0JpdG1hcDo6bG9ja1BpeGVscygpL3VubG9ja1BpeGVscygpIGZvciBsYXp5IGltYWdl IGRlY29kaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMDc0MDQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBTa2JpdG1hcDo6bG9ja1BpeGVscygpL3VubG9ja1BpeGVscygpIGFyZSBub3QgdGhyZWFkc2Fm ZS4KKyAgICAgICAgdW5saWtlIFNrUGl4ZWxSZWYsIHRoZXNlIDIgY2FsbHMgYXJlIG5vdCBwcm90 ZWN0ZWQgYnkgYW4gaW50ZXJuYWwgbXV0ZXguCisgICAgICAgIEJ1Z2ZpeCwgbm8gYmVoYXZpcmFs IGNoYW5nZSBhbmQgaGFyZCB0byB0ZXN0IGFzIHRlc3RzIHdpbGwgYmUgZmxha3kuCisKKyAgICAg ICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9JbWFnZURlY29kaW5nU3RvcmUuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6SW1hZ2VEZWNvZGluZ1N0b3JlOjpsb2NrQ2FjaGUpOgorICAgICAg ICAoV2ViQ29yZTo6SW1hZ2VEZWNvZGluZ1N0b3JlOjp1bmxvY2tDYWNoZSk6CisgICAgICAgIChX ZWJDb3JlOjpJbWFnZURlY29kaW5nU3RvcmU6Omluc2VydEFuZExvY2tDYWNoZSk6CisgICAgICAg IChXZWJDb3JlOjpJbWFnZURlY29kaW5nU3RvcmU6Om92ZXJ3cml0ZUFuZExvY2tDYWNoZSk6Cisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vSW1hZ2VEZWNvZGluZ1N0b3JlLmg6 CisgICAgICAgIChJbWFnZURlY29kaW5nU3RvcmUpOgorCiAyMDEzLTAxLTIwICBTaW1vbiBGcmFz ZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIEF2b2lkIGZpbGxpbmcgYSBy b3VuZGVkIHJlY3Qgd2hlbiByYWRpaSBhcmUgemVybwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vSW1hZ2VEZWNvZGluZ1N0b3JlLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ltYWdlRGVjb2RpbmdTdG9y ZS5jcHAKaW5kZXggNTk5MmM1MDAzZDE4YTZkMDQyNDI1M2RiMWFlNzA5ODdmZWJmNjE2ZC4uNTAx Y2M1NTI5YWQyOGZjNzRmZmVlNGY0MGNmY2I0NDNmMTQ0NDRhYSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vSW1hZ2VEZWNvZGluZ1N0b3JlLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9JbWFnZURl Y29kaW5nU3RvcmUuY3BwCkBAIC05NiwyMyArOTYsMjMgQEAgYm9vbCBJbWFnZURlY29kaW5nU3Rv cmU6OmxvY2tDYWNoZShjb25zdCBJbWFnZUZyYW1lR2VuZXJhdG9yKiBnZW5lcmF0b3IsIGNvbnN0 IFMKIAogICAgICAgICAvLyBJbmNyZW1lbnQgdXNlIGNvdW50IHN1Y2ggdGhhdCBpdCBkb2Vzbid0 IGdldCBldmljdGVkLgogICAgICAgICBjYWNoZUVudHJ5LT5pbmNyZW1lbnRVc2VDb3VudCgpOwot ICAgIH0KIAotICAgIC8vIENvbXBsZXRlIGNhY2hlIGVudHJ5IGRvZXNuJ3QgaGF2ZSBhIGRlY29k ZXIuCi0gICAgQVNTRVJUKCFjYWNoZUVudHJ5LT5jYWNoZWRJbWFnZSgpLT5pc0NvbXBsZXRlKCkg fHwgIWNhY2hlRW50cnktPmNhY2hlZERlY29kZXIoKSk7CisgICAgICAgIC8vIENvbXBsZXRlIGNh Y2hlIGVudHJ5IGRvZXNuJ3QgaGF2ZSBhIGRlY29kZXIuCisgICAgICAgIEFTU0VSVCghY2FjaGVF bnRyeS0+Y2FjaGVkSW1hZ2UoKS0+aXNDb21wbGV0ZSgpIHx8ICFjYWNoZUVudHJ5LT5jYWNoZWRE ZWNvZGVyKCkpOworCisgICAgICAgIGlmIChkZWNvZGVyKQorICAgICAgICAgICAgKmRlY29kZXIg PSBjYWNoZUVudHJ5LT5jYWNoZWREZWNvZGVyKCk7CisgICAgICAgICpjYWNoZWRJbWFnZSA9IGNh Y2hlRW50cnktPmNhY2hlZEltYWdlKCk7CisgICAgICAgICgqY2FjaGVkSW1hZ2UpLT5iaXRtYXAo KS5sb2NrUGl4ZWxzKCk7CisgICAgfQogCi0gICAgaWYgKGRlY29kZXIpCi0gICAgICAgICpkZWNv ZGVyID0gY2FjaGVFbnRyeS0+Y2FjaGVkRGVjb2RlcigpOwotICAgICpjYWNoZWRJbWFnZSA9IGNh Y2hlRW50cnktPmNhY2hlZEltYWdlKCk7Ci0gICAgKCpjYWNoZWRJbWFnZSktPmJpdG1hcCgpLmxv Y2tQaXhlbHMoKTsKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAogdm9pZCBJbWFnZURlY29kaW5nU3Rv cmU6OnVubG9ja0NhY2hlKGNvbnN0IEltYWdlRnJhbWVHZW5lcmF0b3IqIGdlbmVyYXRvciwgY29u c3QgU2NhbGVkSW1hZ2VGcmFnbWVudCogY2FjaGVkSW1hZ2UpCiB7Ci0gICAgY2FjaGVkSW1hZ2Ut PmJpdG1hcCgpLnVubG9ja1BpeGVscygpOwotCiAgICAgTXV0ZXhMb2NrZXIgbG9jayhtX211dGV4 KTsKKyAgICBjYWNoZWRJbWFnZS0+Yml0bWFwKCkudW5sb2NrUGl4ZWxzKCk7CiAgICAgQ2FjaGVN YXA6Oml0ZXJhdG9yIGl0ZXIgPSBtX2NhY2hlTWFwLmZpbmQoc3RkOjptYWtlX3BhaXIoZ2VuZXJh dG9yLCBjYWNoZWRJbWFnZS0+c2NhbGVkU2l6ZSgpKSk7CiAgICAgQVNTRVJUKGl0ZXIgIT0gbV9j YWNoZU1hcC5lbmQoKSk7CiAKQEAgLTEyOSw5ICsxMjksNiBAQCBjb25zdCBTY2FsZWRJbWFnZUZy YWdtZW50KiBJbWFnZURlY29kaW5nU3RvcmU6Omluc2VydEFuZExvY2tDYWNoZShjb25zdCBJbWFn ZUZyYQogICAgIC8vIFBydW5lIG9sZCBjYWNoZSBlbnRyaWVzIHRvIGdpdmUgc3BhY2UgZm9yIHRo ZSBuZXcgb25lLgogICAgIHBydW5lKCk7CiAKLSAgICAvLyBMb2NrIHRoZSB1bmRlcmx5aW5nIFNr Qml0bWFwIHRvIHByZXZlbnQgaXQgZnJvbSBiZWluZyBwdXJnZWQuCi0gICAgaW1hZ2UtPmJpdG1h cCgpLmxvY2tQaXhlbHMoKTsKLQogICAgIFNjYWxlZEltYWdlRnJhZ21lbnQqIGNhY2hlZEltYWdl ID0gaW1hZ2UuZ2V0KCk7CiAgICAgT3duUHRyPENhY2hlRW50cnk+IG5ld0NhY2hlRW50cnk7CiAK QEAgLTE0Miw2ICsxMzksOCBAQCBjb25zdCBTY2FsZWRJbWFnZUZyYWdtZW50KiBJbWFnZURlY29k aW5nU3RvcmU6Omluc2VydEFuZExvY2tDYWNoZShjb25zdCBJbWFnZUZyYQogICAgICAgICBuZXdD YWNoZUVudHJ5ID0gQ2FjaGVFbnRyeTo6Y3JlYXRlQW5kVXNlKGdlbmVyYXRvciwgaW1hZ2UsIGRl Y29kZXIpOwogCiAgICAgTXV0ZXhMb2NrZXIgbG9jayhtX211dGV4KTsKKyAgICAvLyBMb2NrIHRo ZSB1bmRlcmx5aW5nIFNrQml0bWFwIHRvIHByZXZlbnQgaXQgZnJvbSBiZWluZyBwdXJnZWQuCisg ICAgY2FjaGVkSW1hZ2UtPmJpdG1hcCgpLmxvY2tQaXhlbHMoKTsKICAgICBBU1NFUlQoIW1fY2Fj aGVNYXAuY29udGFpbnMobmV3Q2FjaGVFbnRyeS0+Y2FjaGVLZXkoKSkpOwogICAgIGluc2VydENh Y2hlSW50ZXJuYWwobmV3Q2FjaGVFbnRyeS5yZWxlYXNlKCkpOwogICAgIHJldHVybiBjYWNoZWRJ bWFnZTsKQEAgLTE0OSwxMiArMTQ4LDExIEBAIGNvbnN0IFNjYWxlZEltYWdlRnJhZ21lbnQqIElt YWdlRGVjb2RpbmdTdG9yZTo6aW5zZXJ0QW5kTG9ja0NhY2hlKGNvbnN0IEltYWdlRnJhCiAKIGNv bnN0IFNjYWxlZEltYWdlRnJhZ21lbnQqIEltYWdlRGVjb2RpbmdTdG9yZTo6b3ZlcndyaXRlQW5k TG9ja0NhY2hlKGNvbnN0IEltYWdlRnJhbWVHZW5lcmF0b3IqIGdlbmVyYXRvciwgY29uc3QgU2Nh bGVkSW1hZ2VGcmFnbWVudCogY2FjaGVkSW1hZ2UsIFBhc3NPd25QdHI8U2NhbGVkSW1hZ2VGcmFn bWVudD4gbmV3SW1hZ2UpCiB7Ci0gICAgY2FjaGVkSW1hZ2UtPmJpdG1hcCgpLnVubG9ja1BpeGVs cygpOwotCiAgICAgT3duUHRyPEltYWdlRGVjb2Rlcj4gdHJhc2g7CiAgICAgY29uc3QgU2NhbGVk SW1hZ2VGcmFnbWVudCogbmV3Q2FjaGVkSW1hZ2UgPSAwOwogICAgIHsKICAgICAgICAgTXV0ZXhM b2NrZXIgbG9jayhtX211dGV4KTsKKyAgICAgICAgY2FjaGVkSW1hZ2UtPmJpdG1hcCgpLnVubG9j a1BpeGVscygpOwogICAgICAgICBDYWNoZU1hcDo6aXRlcmF0b3IgaXRlciA9IG1fY2FjaGVNYXAu ZmluZChzdGQ6Om1ha2VfcGFpcihnZW5lcmF0b3IsIGNhY2hlZEltYWdlLT5zY2FsZWRTaXplKCkp KTsKICAgICAgICAgQVNTRVJUKGl0ZXIgIT0gbV9jYWNoZU1hcC5lbmQoKSk7CiAKQEAgLTE2NCwx MCArMTYyLDEwIEBAIGNvbnN0IFNjYWxlZEltYWdlRnJhZ21lbnQqIEltYWdlRGVjb2RpbmdTdG9y ZTo6b3ZlcndyaXRlQW5kTG9ja0NhY2hlKGNvbnN0IEltYWdlCiAKICAgICAgICAgdHJhc2ggPSBj YWNoZUVudHJ5LT5vdmVyd3JpdGVDYWNoZWRJbWFnZShuZXdJbWFnZSk7CiAgICAgICAgIG5ld0Nh Y2hlZEltYWdlID0gY2FjaGVFbnRyeS0+Y2FjaGVkSW1hZ2UoKTsKKyAgICAgICAgLy8gTG9jayB0 aGUgdW5kZXJseWluZyBTa0JpdG1hcCB0byBwcmV2ZW50IGl0IGZyb20gYmVpbmcgcHVyZ2VkLgor ICAgICAgICBuZXdDYWNoZWRJbWFnZS0+Yml0bWFwKCkubG9ja1BpeGVscygpOwogICAgIH0KIAot ICAgIC8vIExvY2sgdGhlIHVuZGVybHlpbmcgU2tCaXRtYXAgdG8gcHJldmVudCBpdCBmcm9tIGJl aW5nIHB1cmdlZC4KLSAgICBuZXdDYWNoZWRJbWFnZS0+Yml0bWFwKCkubG9ja1BpeGVscygpOwog ICAgIHJldHVybiBuZXdDYWNoZWRJbWFnZTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vSW1hZ2VEZWNvZGluZ1N0b3JlLmggYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9JbWFnZURlY29kaW5nU3RvcmUu aAppbmRleCA1ZjFmYjI4YWViNDBiOTI0NWRjZDhjODI3ZTI4NmY3ODI0YmJiZjc3Li5lYWFjNDNh Yzk5M2QzYzlhZDlmMmVjNjgxZWE1MjA0NDBiNGI2YWEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9JbWFnZURlY29kaW5nU3RvcmUuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9JbWFnZURlY29kaW5n U3RvcmUuaApAQCAtMTYzLDYgKzE2Myw4IEBAIHByaXZhdGU6CiAgICAgLy8gICBtX2NhY2hlZFNp emVNYXAKICAgICAvLyAgIG1fY2FjaGVMaW1pdEluQnl0ZXMKICAgICAvLyAgIG1fbWVtb3J5VXNh Z2VJbkJ5dGVzCisgICAgLy8gVGhpcyBtdXRleCBhbHNvIHByb3RlY3RzIGNhbGxzIHRvIHVuZGVy bHlpbmcgc2tCaXRtYXAncworICAgIC8vIGxvY2tQaXhlbHMoKS91bmxvY2tQaXhlbHMoKSBhcyB0 aGV5IGFyZSBub3QgdGhyZWFkc2FmZS4KICAgICBNdXRleCBtX211dGV4OwogfTsKIAo=