43980 2010-08-13 10:56:54 -0700 REGRESSION(r65331): This patch breaks some shadow tests on Qt Linux release (Requested by ariya on #webkit). 2010-08-13 11:05:51 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 34479 1 webkit.review.bot webkit.review.bot ariya.hidayat commit-queue hausmann oldest_to_newest 264437 0 webkit.review.bot 2010-08-13 10:56:54 -0700 http://trac.webkit.org/changeset/65331 broke the build: This patch breaks some shadow tests on Qt Linux release (Requested by ariya on #webkit). This is an automatic bug report generated by the sheriff-bot. If this bug report was created because of a flaky test, please file a bug for the flaky test (if we don't already have one on file) and dup this bug against that bug so that we can track how often these flaky tests case pain. "Only you can prevent forest fires." -- Smokey the Bear 264438 1 64356 webkit.review.bot 2010-08-13 10:57:09 -0700 Created attachment 64356 ROLLOUT of r65331 Any committer can land this patch automatically by marking it commit-queue+. The commit-queue will build and test the patch before landing to ensure that the rollout will be successful. This process takes approximately 15 minutes. If you would like to land the rollout faster, you can use the following command: webkit-patch land-attachment ATTACHMENT_ID --ignore-builders where ATTACHMENT_ID is the ID of this attachment. 264440 2 64356 commit-queue 2010-08-13 11:05:46 -0700 Comment on attachment 64356 ROLLOUT of r65331 Clearing flags on attachment: 64356 Committed r65334: <http://trac.webkit.org/changeset/65334> 264441 3 commit-queue 2010-08-13 11:05:51 -0700 All reviewed patches have been landed. Closing bug. 64356 2010-08-13 10:57:09 -0700 2010-08-13 11:05:46 -0700 ROLLOUT of r65331 bug-43980-20100813175707.patch text/plain 14476 webkit.review.bot ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NmFjYjg1OWFlMzU0NmNmZTIyMThhNTA4YjlhMzQxOGIxMzkyZjg5OC4uNGY2OWFmNjM5ODkzYzhj ZDhiYmQyYzJkMGI1OTA2YjUzZDU2M2QxZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNyBAQAorMjAxMC0wOC0xMyAgU2hl cmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+CisKKyAgICAgICAgVW5yZXZp ZXdlZCwgcm9sbGluZyBvdXQgcjY1MzMxLgorICAgICAgICBodHRwOi8vdHJhYy53ZWJraXQub3Jn L2NoYW5nZXNldC82NTMzMQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NDM5ODAKKworICAgICAgICBUaGlzIHBhdGNoIGJyZWFrcyBzb21lIHNoYWRvdyB0 ZXN0cyBvbiBRdCBMaW51eCByZWxlYXNlCisgICAgICAgIChSZXF1ZXN0ZWQgYnkgYXJpeWEgb24g I3dlYmtpdCkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0NvbnRl eHRRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHRQbGF0Zm9ybVByaXZh dGU6OkdyYXBoaWNzQ29udGV4dFBsYXRmb3JtUHJpdmF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpH cmFwaGljc0NvbnRleHQ6OmRyYXdSZWN0KToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29u dGV4dDo6ZHJhd0xpbmUpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0OjpzdHJv a2VBcmMpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0OjpkcmF3Q29udmV4UG9s eWdvbik6CisgICAgICAgIChXZWJDb3JlOjpkcmF3RmlsbGVkU2hhZG93UGF0aCk6CisgICAgICAg IChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OmZpbGxQYXRoKToKKyAgICAgICAgKFdlYkNvcmU6 OkdyYXBoaWNzQ29udGV4dDo6c3Ryb2tlUGF0aCk6CisgICAgICAgIChXZWJDb3JlOjpkcmF3Qm9y ZGVybGVzc1JlY3RTaGFkb3cpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0Ojpm aWxsUmVjdCk6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OmZpbGxSb3VuZGVk UmVjdCk6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OnNldFBsYXRmb3JtU2hh ZG93KToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDo6Y2xlYXJQbGF0Zm9ybVNo YWRvdyk6CisKIDIwMTAtMDgtMTMgIEtpbnVrbyBZYXN1ZGEgIDxraW51a29AY2hyb21pdW0ub3Jn PgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhdmlkIExldmluLgpkaWZmIC0tZ2l0IGEvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0NvbnRleHRRdC5jcHAgYi9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzQ29udGV4dFF0LmNwcAppbmRleCBhNDA5MzI4YzVh Mzc4YjAzNGM1MjRkNTkyMTgyMTA2NTJjODYxZGIwLi5jYzMzMWJjODNjMWU4NmQ5ZjVkMDg3MjA4 ZDA3ZGJlNjM3OGM3OWZiIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0 L0dyYXBoaWNzQ29udGV4dFF0LmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0 L0dyYXBoaWNzQ29udGV4dFF0LmNwcApAQCAtMTk5LDIxICsxOTksNiBAQCBwdWJsaWM6CiAgICAg Ly8gT25seSB1c2VkIGJ5IFNWRyBmb3Igbm93LgogICAgIFFQYWludGVyUGF0aCBjdXJyZW50UGF0 aDsKIAotICAgIGVudW0gewotICAgICAgICBOb1NoYWRvdywKLSAgICAgICAgT3BhcXVlU29saWRT aGFkb3csCi0gICAgICAgIEFscGhhU29saWRTaGFkb3csCi0gICAgICAgIEJsdXJTaGFkb3cKLSAg ICB9IHNoYWRvd1R5cGU7Ci0gICAgUUNvbG9yIHNoYWRvd0NvbG9yOwotICAgIGludCBzaGFkb3dC bHVyUmFkaXVzOwotICAgIFFQb2ludEYgc2hhZG93T2Zmc2V0OwotCi0gICAgYm9vbCBoYXNTaGFk b3coKSBjb25zdAotICAgIHsKLSAgICAgICAgcmV0dXJuIHNoYWRvd1R5cGUgIT0gTm9TaGFkb3c7 Ci0gICAgfQotCiBwcml2YXRlOgogICAgIFFQYWludGVyKiBwYWludGVyOwogfTsKQEAgLTIzNyw5 ICsyMjIsNiBAQCBHcmFwaGljc0NvbnRleHRQbGF0Zm9ybVByaXZhdGU6OkdyYXBoaWNzQ29udGV4 dFBsYXRmb3JtUHJpdmF0ZShRUGFpbnRlciogcCkKICAgICAgICAgcGFpbnRlci0+c2V0UmVuZGVy SGludChRUGFpbnRlcjo6U21vb3RoUGl4bWFwVHJhbnNmb3JtLCB0cnVlKTsKICAgICB9IGVsc2UK ICAgICAgICAgYW50aUFsaWFzaW5nRm9yUmVjdHNBbmRMaW5lcyA9IGZhbHNlOwotCi0gICAgc2hh ZG93VHlwZSA9IE5vU2hhZG93OwotICAgIHNoYWRvd0JsdXJSYWRpdXMgPSAwOwogfQogCiBHcmFw aGljc0NvbnRleHRQbGF0Zm9ybVByaXZhdGU6On5HcmFwaGljc0NvbnRleHRQbGF0Zm9ybVByaXZh dGUoKQpAQCAtMzEwLDExICsyOTIsMTYgQEAgdm9pZCBHcmFwaGljc0NvbnRleHQ6OmRyYXdSZWN0 KGNvbnN0IEludFJlY3QmIHJlY3QpCiAgICAgY29uc3QgYm9vbCBhbnRpQWxpYXMgPSBwLT50ZXN0 UmVuZGVySGludChRUGFpbnRlcjo6QW50aWFsaWFzaW5nKTsKICAgICBwLT5zZXRSZW5kZXJIaW50 KFFQYWludGVyOjpBbnRpYWxpYXNpbmcsIG1fZGF0YS0+YW50aUFsaWFzaW5nRm9yUmVjdHNBbmRM aW5lcyk7CiAKLSAgICBpZiAobV9kYXRhLT5oYXNTaGFkb3coKSkgewotICAgICAgICBJbnRSZWN0 IHNoYWRvd1JlY3QgPSByZWN0OwotICAgICAgICBzaGFkb3dSZWN0Lm1vdmUobV9kYXRhLT5zaGFk b3dPZmZzZXQueCgpLCBtX2RhdGEtPnNoYWRvd09mZnNldC55KCkpOwotICAgICAgICBzaGFkb3dS ZWN0LmluZmxhdGUoc3RhdGljX2Nhc3Q8aW50PihwLT5wZW4oKS53aWR0aEYoKSkpOwotICAgICAg ICBwLT5maWxsUmVjdChzaGFkb3dSZWN0LCBtX2RhdGEtPnNoYWRvd0NvbG9yKTsKKyAgICBpZiAo bV9jb21tb24tPnN0YXRlLnNoYWRvd0NvbG9yLmlzVmFsaWQoKSkgeworICAgICAgICBGbG9hdFNp emUgc2hhZG93U2l6ZTsKKyAgICAgICAgZmxvYXQgc2hhZG93Qmx1cjsKKyAgICAgICAgQ29sb3Ig c2hhZG93Q29sb3I7CisgICAgICAgIGlmIChnZXRTaGFkb3coc2hhZG93U2l6ZSwgc2hhZG93Qmx1 ciwgc2hhZG93Q29sb3IpKSB7CisgICAgICAgICAgICBJbnRSZWN0IHNoYWRvd1JlY3QgPSByZWN0 OworICAgICAgICAgICAgc2hhZG93UmVjdC5tb3ZlKHNoYWRvd1NpemUud2lkdGgoKSwgc2hhZG93 U2l6ZS5oZWlnaHQoKSk7CisgICAgICAgICAgICBzaGFkb3dSZWN0LmluZmxhdGUoc3RhdGljX2Nh c3Q8aW50PihwLT5wZW4oKS53aWR0aEYoKSkpOworICAgICAgICAgICAgcC0+ZmlsbFJlY3Qoc2hh ZG93UmVjdCwgUUNvbG9yKHNoYWRvd0NvbG9yKSk7CisgICAgICAgIH0KICAgICB9CiAKICAgICBw LT5kcmF3UmVjdChyZWN0KTsKQEAgLTM0NCwxNCArMzMxLDE1IEBAIHZvaWQgR3JhcGhpY3NDb250 ZXh0OjpkcmF3TGluZShjb25zdCBJbnRQb2ludCYgcG9pbnQxLCBjb25zdCBJbnRQb2ludCYgcG9p bnQyKQogICAgIHAtPnNldFJlbmRlckhpbnQoUVBhaW50ZXI6OkFudGlhbGlhc2luZywgbV9kYXRh LT5hbnRpQWxpYXNpbmdGb3JSZWN0c0FuZExpbmVzKTsKICAgICBhZGp1c3RMaW5lVG9QaXhlbEJv dW5kYXJpZXMocDEsIHAyLCB3aWR0aCwgc3R5bGUpOwogCi0gICAgaWYgKG1fZGF0YS0+aGFzU2hh ZG93KCkpIHsKLSAgICAgICAgaWYgKHRleHREcmF3aW5nTW9kZSgpID09IGNUZXh0RmlsbCkgewot ICAgICAgICAgICAgcC0+c2F2ZSgpOwotICAgICAgICAgICAgcC0+dHJhbnNsYXRlKG1fZGF0YS0+ c2hhZG93T2Zmc2V0KTsKLSAgICAgICAgICAgIHAtPnNldFBlbihtX2RhdGEtPnNoYWRvd0NvbG9y KTsKLSAgICAgICAgICAgIHAtPmRyYXdMaW5lKHAxLCBwMik7Ci0gICAgICAgICAgICBwLT5yZXN0 b3JlKCk7Ci0gICAgICAgIH0KKyAgICBGbG9hdFNpemUgc2hhZG93U2l6ZTsKKyAgICBmbG9hdCBz aGFkb3dCbHVyOworICAgIENvbG9yIHNoYWRvd0NvbG9yOworICAgIGlmICh0ZXh0RHJhd2luZ01v ZGUoKSA9PSBjVGV4dEZpbGwgJiYgZ2V0U2hhZG93KHNoYWRvd1NpemUsIHNoYWRvd0JsdXIsIHNo YWRvd0NvbG9yKSkgeworICAgICAgICBwLT5zYXZlKCk7CisgICAgICAgIHAtPnRyYW5zbGF0ZShz aGFkb3dTaXplLndpZHRoKCksIHNoYWRvd1NpemUuaGVpZ2h0KCkpOworICAgICAgICBwLT5zZXRQ ZW4oc2hhZG93Q29sb3IpOworICAgICAgICBwLT5kcmF3TGluZShwMSwgcDIpOworICAgICAgICBw LT5yZXN0b3JlKCk7CiAgICAgfQogCiAgICAgaW50IHBhdFdpZHRoID0gMDsKQEAgLTQ0NSwxNCAr NDMzLDE2IEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpzdHJva2VBcmMoY29uc3QgSW50UmVjdCYg cmVjdCwgaW50IHN0YXJ0QW5nbGUsIGludCBhbmdsZVNwCiAgICAgY29uc3QgYm9vbCBhbnRpQWxp YXMgPSBwLT50ZXN0UmVuZGVySGludChRUGFpbnRlcjo6QW50aWFsaWFzaW5nKTsKICAgICBwLT5z ZXRSZW5kZXJIaW50KFFQYWludGVyOjpBbnRpYWxpYXNpbmcsIHRydWUpOwogCisgICAgRmxvYXRT aXplIHNoYWRvd1NpemU7CisgICAgZmxvYXQgc2hhZG93Qmx1cjsKKyAgICBDb2xvciBzaGFkb3dD b2xvcjsKICAgICBzdGFydEFuZ2xlICo9IDE2OwogICAgIGFuZ2xlU3BhbiAqPSAxNjsKLQotICAg IGlmIChtX2RhdGEtPmhhc1NoYWRvdygpKSB7CisgICAgaWYgKGdldFNoYWRvdyhzaGFkb3dTaXpl LCBzaGFkb3dCbHVyLCBzaGFkb3dDb2xvcikpIHsKICAgICAgICAgcC0+c2F2ZSgpOwotICAgICAg ICBwLT50cmFuc2xhdGUobV9kYXRhLT5zaGFkb3dPZmZzZXQpOworICAgICAgICBwLT50cmFuc2xh dGUoc2hhZG93U2l6ZS53aWR0aCgpLCBzaGFkb3dTaXplLmhlaWdodCgpKTsKICAgICAgICAgUVBl biBwZW4ocC0+cGVuKCkpOwotICAgICAgICBwZW4uc2V0Q29sb3IobV9kYXRhLT5zaGFkb3dDb2xv cik7CisgICAgICAgIHBlbi5zZXRDb2xvcihzaGFkb3dDb2xvcik7CiAgICAgICAgIHAtPnNldFBl bihwZW4pOwogICAgICAgICBwLT5kcmF3QXJjKHJlY3QsIHN0YXJ0QW5nbGUsIGFuZ2xlU3Bhbik7 CiAgICAgICAgIHAtPnJlc3RvcmUoKTsKQEAgLTQ3OCwxNCArNDY4LDE3IEBAIHZvaWQgR3JhcGhp Y3NDb250ZXh0OjpkcmF3Q29udmV4UG9seWdvbihzaXplX3QgbnBvaW50cywgY29uc3QgRmxvYXRQ b2ludCogcG9pbnRzCiAgICAgUVBhaW50ZXIqIHAgPSBtX2RhdGEtPnAoKTsKICAgICBwLT5zYXZl KCk7CiAgICAgcC0+c2V0UmVuZGVySGludChRUGFpbnRlcjo6QW50aWFsaWFzaW5nLCBzaG91bGRB bnRpYWxpYXMpOwotICAgIGlmIChtX2RhdGEtPmhhc1NoYWRvdygpKSB7CisgICAgRmxvYXRTaXpl IHNoYWRvd1NpemU7CisgICAgZmxvYXQgc2hhZG93Qmx1cjsKKyAgICBDb2xvciBzaGFkb3dDb2xv cjsKKyAgICBpZiAoZ2V0U2hhZG93KHNoYWRvd1NpemUsIHNoYWRvd0JsdXIsIHNoYWRvd0NvbG9y KSkgewogICAgICAgICBwLT5zYXZlKCk7Ci0gICAgICAgIHAtPnRyYW5zbGF0ZShtX2RhdGEtPnNo YWRvd09mZnNldCk7CisgICAgICAgIHAtPnRyYW5zbGF0ZShzaGFkb3dTaXplLndpZHRoKCksIHNo YWRvd1NpemUuaGVpZ2h0KCkpOwogICAgICAgICBpZiAocC0+YnJ1c2goKS5zdHlsZSgpICE9IFF0 OjpOb0JydXNoKQotICAgICAgICAgICAgcC0+c2V0QnJ1c2goUUJydXNoKG1fZGF0YS0+c2hhZG93 Q29sb3IpKTsKKyAgICAgICAgICAgIHAtPnNldEJydXNoKFFCcnVzaChzaGFkb3dDb2xvcikpOwog ICAgICAgICBRUGVuIHBlbihwLT5wZW4oKSk7CiAgICAgICAgIGlmIChwZW4uc3R5bGUoKSAhPSBR dDo6Tm9QZW4pIHsKLSAgICAgICAgICAgIHBlbi5zZXRDb2xvcihtX2RhdGEtPnNoYWRvd0NvbG9y KTsKKyAgICAgICAgICAgIHBlbi5zZXRDb2xvcihzaGFkb3dDb2xvcik7CiAgICAgICAgICAgICBw LT5zZXRQZW4ocGVuKTsKICAgICAgICAgfQogICAgICAgICBwLT5kcmF3Q29udmV4UG9seWdvbihw b2x5Z29uKTsKQEAgLTUxOSw2ICs1MTIsMTggQEAgUVBlbiBHcmFwaGljc0NvbnRleHQ6OnBlbigp CiAgICAgcmV0dXJuIHAtPnBlbigpOwogfQogCitzdGF0aWMgdm9pZCBpbmxpbmUgZHJhd0ZpbGxl ZFNoYWRvd1BhdGgoR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBRUGFpbnRlciogcCwgY29uc3Qg UVBhaW50ZXJQYXRoJiBwYXRoKQoreworICAgIEZsb2F0U2l6ZSBzaGFkb3dTaXplOworICAgIGZs b2F0IHNoYWRvd0JsdXI7CisgICAgQ29sb3Igc2hhZG93Q29sb3I7CisgICAgaWYgKGNvbnRleHQt PmdldFNoYWRvdyhzaGFkb3dTaXplLCBzaGFkb3dCbHVyLCBzaGFkb3dDb2xvcikpIHsKKyAgICAg ICAgcC0+dHJhbnNsYXRlKHNoYWRvd1NpemUud2lkdGgoKSwgc2hhZG93U2l6ZS5oZWlnaHQoKSk7 CisgICAgICAgIHAtPmZpbGxQYXRoKHBhdGgsIFFCcnVzaChzaGFkb3dDb2xvcikpOworICAgICAg ICBwLT50cmFuc2xhdGUoLXNoYWRvd1NpemUud2lkdGgoKSwgLXNoYWRvd1NpemUuaGVpZ2h0KCkp OworICAgIH0KK30KKwogdm9pZCBHcmFwaGljc0NvbnRleHQ6OmZpbGxQYXRoKCkKIHsKICAgICBp ZiAocGFpbnRpbmdEaXNhYmxlZCgpKQpAQCAtNTI4LDExICs1MzMsNyBAQCB2b2lkIEdyYXBoaWNz Q29udGV4dDo6ZmlsbFBhdGgoKQogICAgIFFQYWludGVyUGF0aCYgcGF0aCA9IG1fZGF0YS0+Y3Vy cmVudFBhdGg7IC8vIEF2b2lkIGRldGFjaGluZyB0aGUgUVBhaW50ZXJQYXRoCiAgICAgcGF0aC5z ZXRGaWxsUnVsZSh0b1F0RmlsbFJ1bGUoZmlsbFJ1bGUoKSkpOwogCi0gICAgaWYgKG1fZGF0YS0+ aGFzU2hhZG93KCkpIHsKLSAgICAgICAgcC0+dHJhbnNsYXRlKG1fZGF0YS0+c2hhZG93T2Zmc2V0 KTsKLSAgICAgICAgcC0+ZmlsbFBhdGgocGF0aCwgbV9kYXRhLT5zaGFkb3dDb2xvcik7Ci0gICAg ICAgIHAtPnRyYW5zbGF0ZSgtbV9kYXRhLT5zaGFkb3dPZmZzZXQpOwotICAgIH0KKyAgICBkcmF3 RmlsbGVkU2hhZG93UGF0aCh0aGlzLCBwLCBwYXRoKTsKICAgICBpZiAobV9jb21tb24tPnN0YXRl LmZpbGxQYXR0ZXJuKSB7CiAgICAgICAgIEFmZmluZVRyYW5zZm9ybSBhZmZpbmU7CiAgICAgICAg IHAtPmZpbGxQYXRoKHBhdGgsIFFCcnVzaChtX2NvbW1vbi0+c3RhdGUuZmlsbFBhdHRlcm4tPmNy ZWF0ZVBsYXRmb3JtUGF0dGVybihhZmZpbmUpKSk7CkBAIC01NTYsMTIgKzU1NywxNiBAQCB2b2lk IEdyYXBoaWNzQ29udGV4dDo6c3Ryb2tlUGF0aCgpCiAgICAgUVBhaW50ZXJQYXRoJiBwYXRoID0g bV9kYXRhLT5jdXJyZW50UGF0aDsgLy8gQXZvaWQgZGV0YWNoaW5nIHRoZSBRUGFpbnRlclBhdGgK ICAgICBwYXRoLnNldEZpbGxSdWxlKHRvUXRGaWxsUnVsZShmaWxsUnVsZSgpKSk7CiAKLSAgICBp ZiAobV9kYXRhLT5oYXNTaGFkb3coKSkgewotICAgICAgICBwLT50cmFuc2xhdGUobV9kYXRhLT5z aGFkb3dPZmZzZXQpOworICAgIEZsb2F0U2l6ZSBzaGFkb3dTaXplOworICAgIGZsb2F0IHNoYWRv d0JsdXI7CisgICAgQ29sb3Igc2hhZG93Q29sb3I7CisgICAgaWYgKGdldFNoYWRvdyhzaGFkb3dT aXplLCBzaGFkb3dCbHVyLCBzaGFkb3dDb2xvcikpIHsKKyAgICAgICAgUVRyYW5zZm9ybSB0KHAt PndvcmxkVHJhbnNmb3JtKCkpOworICAgICAgICBwLT50cmFuc2xhdGUoc2hhZG93U2l6ZS53aWR0 aCgpLCBzaGFkb3dTaXplLmhlaWdodCgpKTsKICAgICAgICAgUVBlbiBzaGFkb3dQZW4ocGVuKTsK LSAgICAgICAgc2hhZG93UGVuLnNldENvbG9yKG1fZGF0YS0+c2hhZG93Q29sb3IpOworICAgICAg ICBzaGFkb3dQZW4uc2V0Q29sb3Ioc2hhZG93Q29sb3IpOwogICAgICAgICBwLT5zdHJva2VQYXRo KHBhdGgsIHNoYWRvd1Blbik7Ci0gICAgICAgIHAtPnRyYW5zbGF0ZSgtbV9kYXRhLT5zaGFkb3dP ZmZzZXQpOworICAgICAgICBwLT5zZXRXb3JsZFRyYW5zZm9ybSh0KTsKICAgICB9CiAgICAgaWYg KG1fY29tbW9uLT5zdGF0ZS5zdHJva2VQYXR0ZXJuKSB7CiAgICAgICAgIEFmZmluZVRyYW5zZm9y bSBhZmZpbmU7CkBAIC01NzksNiArNTg0LDE4IEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpzdHJv a2VQYXRoKCkKICAgICBtX2RhdGEtPmN1cnJlbnRQYXRoID0gUVBhaW50ZXJQYXRoKCk7CiB9CiAK K3N0YXRpYyBpbmxpbmUgdm9pZCBkcmF3Qm9yZGVybGVzc1JlY3RTaGFkb3coR3JhcGhpY3NDb250 ZXh0KiBjb250ZXh0LCBRUGFpbnRlciogcCwgY29uc3QgRmxvYXRSZWN0JiByZWN0KQoreworICAg IEZsb2F0U2l6ZSBzaGFkb3dTaXplOworICAgIGZsb2F0IHNoYWRvd0JsdXI7CisgICAgQ29sb3Ig c2hhZG93Q29sb3I7CisgICAgaWYgKGNvbnRleHQtPmdldFNoYWRvdyhzaGFkb3dTaXplLCBzaGFk b3dCbHVyLCBzaGFkb3dDb2xvcikpIHsKKyAgICAgICAgRmxvYXRSZWN0IHNoYWRvd1JlY3QocmVj dCk7CisgICAgICAgIHNoYWRvd1JlY3QubW92ZShzaGFkb3dTaXplLndpZHRoKCksIHNoYWRvd1Np emUuaGVpZ2h0KCkpOworICAgICAgICBwLT5maWxsUmVjdChzaGFkb3dSZWN0LCBRQ29sb3Ioc2hh ZG93Q29sb3IpKTsKKyAgICB9Cit9CisKIHN0YXRpYyBpbmxpbmUgdm9pZCBkcmF3UmVwZWF0UGF0 dGVybihRUGFpbnRlciogcCwgUVBpeG1hcCogaW1hZ2UsIGNvbnN0IEZsb2F0UmVjdCYgcmVjdCwg Y29uc3QgYm9vbCByZXBlYXRYLCBjb25zdCBib29sIHJlcGVhdFkpCiB7CiAgICAgLy8gUGF0dGVy bnMgbXVzdCBiZSBwYWludGVkIHNvIHRoYXQgdGhlIHRvcCBsZWZ0IG9mIHRoZSBmaXJzdCBpbWFn ZSBpcyBhbmNob3JlZCBhdApAQCAtNjU0LDE4ICs2NzEsMjIgQEAgdm9pZCBHcmFwaGljc0NvbnRl eHQ6OmZpbGxSZWN0KGNvbnN0IEZsb2F0UmVjdCYgcmVjdCkKICAgICBRUGFpbnRlciogcCA9IG1f ZGF0YS0+cCgpOwogICAgIEZsb2F0UmVjdCBub3JtYWxpemVkUmVjdCA9IHJlY3Qubm9ybWFsaXpl ZCgpOwogCi0gICAgUVJlY3RGIHNoYWRvd0Rlc3RSZWN0OworICAgIEZsb2F0U2l6ZSBzaGFkb3dT aXplOworICAgIGZsb2F0IHNoYWRvd0JsdXI7CisgICAgQ29sb3Igc2hhZG93Q29sb3I7CisgICAg Ym9vbCBoYXNTaGFkb3cgPSBnZXRTaGFkb3coc2hhZG93U2l6ZSwgc2hhZG93Qmx1ciwgc2hhZG93 Q29sb3IpOworICAgIEZsb2F0UmVjdCBzaGFkb3dEZXN0UmVjdDsKICAgICBRSW1hZ2UqIHNoYWRv d0ltYWdlID0gMDsKICAgICBRUGFpbnRlciogcFNoYWRvdyA9IDA7CiAKLSAgICBpZiAobV9kYXRh LT5oYXNTaGFkb3coKSkgeworICAgIGlmIChoYXNTaGFkb3cpIHsKICAgICAgICAgc2hhZG93SW1h Z2UgPSBuZXcgUUltYWdlKHJvdW5kZWRJbnRTaXplKG5vcm1hbGl6ZWRSZWN0LnNpemUoKSksIFFJ bWFnZTo6Rm9ybWF0X0FSR0IzMl9QcmVtdWx0aXBsaWVkKTsKICAgICAgICAgcFNoYWRvdyA9IG5l dyBRUGFpbnRlcihzaGFkb3dJbWFnZSk7CiAgICAgICAgIHNoYWRvd0Rlc3RSZWN0ID0gbm9ybWFs aXplZFJlY3Q7Ci0gICAgICAgIHNoYWRvd0Rlc3RSZWN0LnRyYW5zbGF0ZShtX2RhdGEtPnNoYWRv d09mZnNldCk7CisgICAgICAgIHNoYWRvd0Rlc3RSZWN0Lm1vdmUoc2hhZG93U2l6ZS53aWR0aCgp LCBzaGFkb3dTaXplLmhlaWdodCgpKTsKIAogICAgICAgICBwU2hhZG93LT5zZXRDb21wb3NpdGlv bk1vZGUoUVBhaW50ZXI6OkNvbXBvc2l0aW9uTW9kZV9Tb3VyY2UpOwotICAgICAgICBwU2hhZG93 LT5maWxsUmVjdChzaGFkb3dEZXN0UmVjdCwgbV9kYXRhLT5zaGFkb3dDb2xvcik7CisgICAgICAg IHBTaGFkb3ctPmZpbGxSZWN0KHNoYWRvd0ltYWdlLT5yZWN0KCksIHNoYWRvd0NvbG9yKTsKICAg ICAgICAgcFNoYWRvdy0+c2V0Q29tcG9zaXRpb25Nb2RlKFFQYWludGVyOjpDb21wb3NpdGlvbk1v ZGVfRGVzdGluYXRpb25Jbik7CiAgICAgfQogCkBAIC02NzUsNyArNjk2LDcgQEAgdm9pZCBHcmFw aGljc0NvbnRleHQ6OmZpbGxSZWN0KGNvbnN0IEZsb2F0UmVjdCYgcmVjdCkKICAgICAgICAgUUJy dXNoIGJydXNoKG1fY29tbW9uLT5zdGF0ZS5maWxsUGF0dGVybi0+Y3JlYXRlUGxhdGZvcm1QYXR0 ZXJuKGFmZmluZSkpOwogICAgICAgICBRUGl4bWFwKiBpbWFnZSA9IG1fY29tbW9uLT5zdGF0ZS5m aWxsUGF0dGVybi0+dGlsZUltYWdlKCktPm5hdGl2ZUltYWdlRm9yQ3VycmVudEZyYW1lKCk7CiAK LSAgICAgICAgaWYgKG1fZGF0YS0+aGFzU2hhZG93KCkpIHsKKyAgICAgICAgaWYgKGhhc1NoYWRv dykgewogICAgICAgICAgICAgZHJhd1JlcGVhdFBhdHRlcm4ocFNoYWRvdywgaW1hZ2UsIEZsb2F0 UmVjdChzdGF0aWNfY2FzdDxRUmVjdEY+KHNoYWRvd0ltYWdlLT5yZWN0KCkpKSwgbV9jb21tb24t PnN0YXRlLmZpbGxQYXR0ZXJuLT5yZXBlYXRYKCksIG1fY29tbW9uLT5zdGF0ZS5maWxsUGF0dGVy bi0+cmVwZWF0WSgpKTsKICAgICAgICAgICAgIHBTaGFkb3ctPmVuZCgpOwogICAgICAgICAgICAg cC0+ZHJhd0ltYWdlKHNoYWRvd0Rlc3RSZWN0LCAqc2hhZG93SW1hZ2UsIHNoYWRvd0ltYWdlLT5y ZWN0KCkpOwpAQCAtNjg1LDE0ICs3MDYsMTQgQEAgdm9pZCBHcmFwaGljc0NvbnRleHQ6OmZpbGxS ZWN0KGNvbnN0IEZsb2F0UmVjdCYgcmVjdCkKICAgICAgICAgUUJydXNoIGJydXNoKCptX2NvbW1v bi0+c3RhdGUuZmlsbEdyYWRpZW50LT5wbGF0Zm9ybUdyYWRpZW50KCkpOwogICAgICAgICBicnVz aC5zZXRUcmFuc2Zvcm0obV9jb21tb24tPnN0YXRlLmZpbGxHcmFkaWVudC0+Z3JhZGllbnRTcGFj ZVRyYW5zZm9ybSgpKTsKIAotICAgICAgICBpZiAobV9kYXRhLT5oYXNTaGFkb3coKSkgeworICAg ICAgICBpZiAoaGFzU2hhZG93KSB7CiAgICAgICAgICAgICBwU2hhZG93LT5maWxsUmVjdChzaGFk b3dJbWFnZS0+cmVjdCgpLCBicnVzaCk7CiAgICAgICAgICAgICBwU2hhZG93LT5lbmQoKTsKICAg ICAgICAgICAgIHAtPmRyYXdJbWFnZShzaGFkb3dEZXN0UmVjdCwgKnNoYWRvd0ltYWdlLCBzaGFk b3dJbWFnZS0+cmVjdCgpKTsKICAgICAgICAgfQogICAgICAgICBwLT5maWxsUmVjdChub3JtYWxp emVkUmVjdCwgYnJ1c2gpOwogICAgIH0gZWxzZSB7Ci0gICAgICAgIGlmIChtX2RhdGEtPmhhc1No YWRvdygpKSB7CisgICAgICAgIGlmIChoYXNTaGFkb3cpIHsKICAgICAgICAgICAgIHBTaGFkb3ct PmZpbGxSZWN0KHNoYWRvd0ltYWdlLT5yZWN0KCksIHAtPmJydXNoKCkpOwogICAgICAgICAgICAg cFNoYWRvdy0+ZW5kKCk7CiAgICAgICAgICAgICBwLT5kcmF3SW1hZ2Uoc2hhZG93RGVzdFJlY3Qs ICpzaGFkb3dJbWFnZSwgc2hhZG93SW1hZ2UtPnJlY3QoKSk7CkBAIC03MTIsMTAgKzczMyw4IEBA IHZvaWQgR3JhcGhpY3NDb250ZXh0OjpmaWxsUmVjdChjb25zdCBGbG9hdFJlY3QmIHJlY3QsIGNv bnN0IENvbG9yJiBjb2xvciwgQ29sb3JTCiAKICAgICBtX2RhdGEtPnNvbGlkQ29sb3Iuc2V0Q29s b3IoY29sb3IpOwogICAgIFFQYWludGVyKiBwID0gbV9kYXRhLT5wKCk7Ci0KLSAgICBpZiAobV9k YXRhLT5oYXNTaGFkb3coKSkKLSAgICAgICAgcC0+ZmlsbFJlY3QoUVJlY3RGKHJlY3QpLnRyYW5z bGF0ZWQobV9kYXRhLT5zaGFkb3dPZmZzZXQpLCBtX2RhdGEtPnNoYWRvd0NvbG9yKTsKLQorICAg IGlmIChtX2NvbW1vbi0+c3RhdGUuc2hhZG93Q29sb3IuaXNWYWxpZCgpKQorICAgICAgICBkcmF3 Qm9yZGVybGVzc1JlY3RTaGFkb3codGhpcywgcCwgcmVjdCk7CiAgICAgcC0+ZmlsbFJlY3QocmVj dCwgbV9kYXRhLT5zb2xpZENvbG9yKTsKIH0KIApAQCAtNzI2LDExICs3NDUsNyBAQCB2b2lkIEdy YXBoaWNzQ29udGV4dDo6ZmlsbFJvdW5kZWRSZWN0KGNvbnN0IEludFJlY3QmIHJlY3QsIGNvbnN0 IEludFNpemUmIHRvcExlZgogCiAgICAgUGF0aCBwYXRoID0gUGF0aDo6Y3JlYXRlUm91bmRlZFJl Y3RhbmdsZShyZWN0LCB0b3BMZWZ0LCB0b3BSaWdodCwgYm90dG9tTGVmdCwgYm90dG9tUmlnaHQp OwogICAgIFFQYWludGVyKiBwID0gbV9kYXRhLT5wKCk7Ci0gICAgaWYgKG1fZGF0YS0+aGFzU2hh ZG93KCkpIHsKLSAgICAgICAgcC0+dHJhbnNsYXRlKG1fZGF0YS0+c2hhZG93T2Zmc2V0KTsKLSAg ICAgICAgcC0+ZmlsbFBhdGgocGF0aC5wbGF0Zm9ybVBhdGgoKSwgbV9kYXRhLT5zaGFkb3dDb2xv cik7Ci0gICAgICAgIHAtPnRyYW5zbGF0ZSgtbV9kYXRhLT5zaGFkb3dPZmZzZXQpOwotICAgIH0K KyAgICBkcmF3RmlsbGVkU2hhZG93UGF0aCh0aGlzLCBwLCBwYXRoLnBsYXRmb3JtUGF0aCgpKTsK ICAgICBwLT5maWxsUGF0aChwYXRoLnBsYXRmb3JtUGF0aCgpLCBRQ29sb3IoY29sb3IpKTsKIH0K IApAQCAtODcyLDcgKzg4Nyw3IEBAIEZsb2F0UmVjdCBHcmFwaGljc0NvbnRleHQ6OnJvdW5kVG9E ZXZpY2VQaXhlbHMoY29uc3QgRmxvYXRSZWN0JiBmcmVjdCkKICAgICByZXR1cm4gRmxvYXRSZWN0 KHJvdW5kZWRPcmlnaW4sIHJvdW5kZWRMb3dlclJpZ2h0IC0gcm91bmRlZE9yaWdpbik7CiB9CiAK LXZvaWQgR3JhcGhpY3NDb250ZXh0OjpzZXRQbGF0Zm9ybVNoYWRvdyhjb25zdCBGbG9hdFNpemUm IHNpemUsIGZsb2F0IGJsdXIsIGNvbnN0IENvbG9yJiBjb2xvciwgQ29sb3JTcGFjZSkKK3ZvaWQg R3JhcGhpY3NDb250ZXh0OjpzZXRQbGF0Zm9ybVNoYWRvdyhjb25zdCBGbG9hdFNpemUmIHNpemUs IGZsb2F0LCBjb25zdCBDb2xvciYsIENvbG9yU3BhY2UpCiB7CiAgICAgLy8gUXQgZG9lc24ndCBz dXBwb3J0IHNoYWRvd3MgbmF0aXZlbHksIHRoZXkgYXJlIGRyYXduIG1hbnVhbGx5IGluIHRoZSBk cmF3KgogICAgIC8vIGZ1bmN0aW9ucwpAQCAtODgyLDM5ICs4OTcsMTIgQEAgdm9pZCBHcmFwaGlj c0NvbnRleHQ6OnNldFBsYXRmb3JtU2hhZG93KGNvbnN0IEZsb2F0U2l6ZSYgc2l6ZSwgZmxvYXQg Ymx1ciwgY29uc3QKICAgICAgICAgLy8gV2UgZmxpcCB0aGUgaGVpZ2h0IHNpbmNlIENHIGFuZCBI VE1MNSBDYW52YXMgaGF2ZSBvcHBvc2l0ZSBZIGF4aXMKICAgICAgICAgbV9jb21tb24tPnN0YXRl LnNoYWRvd1NpemUgPSBGbG9hdFNpemUoc2l6ZS53aWR0aCgpLCAtc2l6ZS5oZWlnaHQoKSk7CiAg ICAgfQotCi0gICAgLy8gSGVyZSB3ZSBqdXN0IHN0b3JlIGltcG9ydGFudCBzaGFkb3cgc3RhdGVz LgotCi0gICAgbV9kYXRhLT5zaGFkb3dCbHVyUmFkaXVzID0gcVJvdW5kKGJsdXIpOwotICAgIG1f ZGF0YS0+c2hhZG93T2Zmc2V0ID0gUVBvaW50RihtX2NvbW1vbi0+c3RhdGUuc2hhZG93U2l6ZS53 aWR0aCgpLCBtX2NvbW1vbi0+c3RhdGUuc2hhZG93U2l6ZS5oZWlnaHQoKSk7Ci0gICAgbV9kYXRh LT5zaGFkb3dDb2xvciA9IGNvbG9yOwotCi0gICAgLy8gVGhlIHR5cGUgb2Ygc2hhZG93IGlzIGRl Y2lkZWQgYnkgdGhlIGJsdXIgcmFkaXVzLCBzaGFkb3cgb2Zmc2V0LCBhbmQgc2hhZG93IGNvbG9y LgotCi0gICAgaWYgKCFjb2xvci5pc1ZhbGlkKCkgfHwgIWNvbG9yLmFscGhhKCkpIHsKLSAgICAg ICAgLy8gQ2FuJ3QgcGFpbnQgdGhlIHNoYWRvdyB3aXRoIGludmFsaWQgb3IgaW52aXNpYmxlIGNv bG9yLgotICAgICAgICBtX2RhdGEtPnNoYWRvd1R5cGUgPSBHcmFwaGljc0NvbnRleHRQbGF0Zm9y bVByaXZhdGU6Ok5vU2hhZG93OwotICAgIH0gZWxzZSB7Ci0gICAgICAgIGlmIChibHVyID49IDEp IHsKLSAgICAgICAgICAgIC8vIFNoYWRvdyBpcyBhbHdheXMgYmx1cnJlZCwgZXZlbiB0aGUgb2Zm c2V0IGlzIHplcm8uCi0gICAgICAgICAgICBtX2RhdGEtPnNoYWRvd1R5cGUgPSBHcmFwaGljc0Nv bnRleHRQbGF0Zm9ybVByaXZhdGU6OkJsdXJTaGFkb3c7Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAg ICAgICAgICBpZiAobV9kYXRhLT5zaGFkb3dPZmZzZXQuaXNOdWxsKCkpIHsKLSAgICAgICAgICAg ICAgICAvLyBXaXRob3V0IGJsdXIgYW5kIHplcm8gb2Zmc2V0IG1lYW5zIHRoZSBzaGFkb3cgaXMg ZnVsbHkgaGlkZGVuLgotICAgICAgICAgICAgICAgIG1fZGF0YS0+c2hhZG93VHlwZSA9IEdyYXBo aWNzQ29udGV4dFBsYXRmb3JtUHJpdmF0ZTo6Tm9TaGFkb3c7Ci0gICAgICAgICAgICB9IGVsc2Ug ewotICAgICAgICAgICAgICAgIGlmIChjb2xvci5oYXNBbHBoYSgpKQotICAgICAgICAgICAgICAg ICAgICBtX2RhdGEtPnNoYWRvd1R5cGUgPSBHcmFwaGljc0NvbnRleHRQbGF0Zm9ybVByaXZhdGU6 OkFscGhhU29saWRTaGFkb3c7Ci0gICAgICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAg ICAgICBtX2RhdGEtPnNoYWRvd1R5cGUgPSBHcmFwaGljc0NvbnRleHRQbGF0Zm9ybVByaXZhdGU6 Ok9wYXF1ZVNvbGlkU2hhZG93OwotICAgICAgICAgICAgfQotICAgICAgICB9Ci0gICAgfQogfQog CiB2b2lkIEdyYXBoaWNzQ29udGV4dDo6Y2xlYXJQbGF0Zm9ybVNoYWRvdygpCiB7Ci0gICAgbV9k YXRhLT5zaGFkb3dUeXBlID0gR3JhcGhpY3NDb250ZXh0UGxhdGZvcm1Qcml2YXRlOjpOb1NoYWRv dzsKKyAgICAvLyBRdCBkb2Vzbid0IHN1cHBvcnQgc2hhZG93cyBuYXRpdmVseSwgdGhleSBhcmUg ZHJhd24gbWFudWFsbHkgaW4gdGhlIGRyYXcqCisgICAgLy8gZnVuY3Rpb25zCiB9CiAKIHZvaWQg R3JhcGhpY3NDb250ZXh0OjpiZWdpblRyYW5zcGFyZW5jeUxheWVyKGZsb2F0IG9wYWNpdHkpCg==