57349 2011-03-29 09:23:33 -0700 Web Inspector: audit run never completes, fails in DOMAgent.js 2011-03-30 09:06:01 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 caseq caseq apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik yurys oldest_to_newest 375417 0 caseq 2011-03-29 09:23:33 -0700 1. Navigate to http://cnn.com 2. Open WebInspector 3. Switch to Audits panel, click run 4. Observe that audit run never completes, the following error is reported to inspector's console: Uncaught TypeError: Cannot read property '0' of null DOMAgent.js:395 376229 1 87510 caseq 2011-03-30 06:02:53 -0700 Created attachment 87510 patch 376345 2 87540 caseq 2011-03-30 08:26:22 -0700 Created attachment 87540 patch This is a trivial workaround for the problem that may be easily back-ported. I'm still looking to land the original patch, as it adds a bit of robustness to other places as well. 376372 3 caseq 2011-03-30 09:06:01 -0700 Manually committed r82453: http://trac.webkit.org/changeset/82453 87510 2011-03-30 06:02:53 -0700 2011-03-30 08:26:22 -0700 patch audits-fix.diff text/plain 12788 caseq ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA5OWNlMmQ2Li5kMjNjMjliIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTEtMDMt MzAgIEFuZHJleSBLb3N5YWtvdiAgPGNhc2VxQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBhdWRpdCBy dW4gbmV2ZXIgY29tcGxldGVzLCBmYWlscyBpbiBET01BZ2VudC5qcworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTczNDkKKworICAgICAgICAqIGluc3Bl Y3Rvci9hdWRpdHMvYXVkaXRzLXBhbmVsLWZ1bmN0aW9uYWwuaHRtbDogZG8gbm90IHN3aXRjaCB0 byBFbGVtZW50cyBwYW5lbCBiZWZvcmUgdGVzdGluZyBBdWRpdHMKKwogMjAxMS0wMy0yOCAgWXV0 YSBLaXRhbXVyYSAgPHl1dGFrQGNocm9taXVtLm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLCB1 cGRhdGUgQ2hyb21pdW0gdGVzdCByZXN1bHRzIGZvciBwbHVnaW5zL3BsdWdpbi1qYXZhc2NyaXB0 LWFjY2Vzcy5odG1sLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2F1ZGl0cy9h dWRpdHMtcGFuZWwtZnVuY3Rpb25hbC5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2F1ZGl0 cy9hdWRpdHMtcGFuZWwtZnVuY3Rpb25hbC5odG1sCmluZGV4IDdjOWYyZWIuLjUwZGVjMmYgMTAw NjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9hdWRpdHMvYXVkaXRzLXBhbmVsLWZ1bmN0 aW9uYWwuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvYXVkaXRzL2F1ZGl0cy1wYW5l bC1mdW5jdGlvbmFsLmh0bWwKQEAgLTE2LDggKzE2LDYgQEAKIDxzY3JpcHQ+CiB2YXIgdGVzdCA9 IGZ1bmN0aW9uKCkKIHsKLSAgICBXZWJJbnNwZWN0b3Iuc2hvd1BhbmVsKCJlbGVtZW50cyIpOwot CiAgICAgSW5zcGVjdG9yVGVzdC5yZWxvYWRQYWdlKHN0ZXAxKTsKIAogICAgIGZ1bmN0aW9uIHN0 ZXAxKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJD b3JlL0NoYW5nZUxvZwppbmRleCAzNGE5NTNmLi40YmEyNDQzIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsNDAgQEAKKzIwMTEtMDMtMzAgIEFuZHJleSBLb3N5YWtvdiAgPGNhc2VxQGNocm9taXVtLm9y Zz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWIg SW5zcGVjdG9yOiBhdWRpdCBydW4gbmV2ZXIgY29tcGxldGVzLCBmYWlscyBpbiBET01BZ2VudC5q cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTczNDkK KworICAgICAgICAtIHJlcXVpcmUgbm9kZSBpZCBpbiBET01BZ2VudCdzIHF1ZXJ5U2VsZWN0b3Io KSAmIHF1ZXJ5U2VsZWN0b3JBbGwoKQorICAgICAgICAtIGZhY3RvciBvdXQgZG9jdW1lbnQgcmVx dWVzdCBsb2dpYyB3aXRoaW4gRE9NQWdlbnQgaW50byBzZXBhcmF0ZSBtZXRob2QKKyAgICAgICAg LSBhZGQgcXVlcnlTZWxlY3RvcigpIGFuZCBxdWVyeVNlbGVjdG9yQWxsKCkgdG8gRE9NQWdlbnQu anMsIGFzc3VyZSB3ZSBoYXZlIGRvY3VtZW50IGJlZm9yZSBjYWxsaW5nIGJhY2stZW5kCisgICAg ICAgIC0gdXNlIHRoZSBhYm92ZSB3cmFwcGVycyBmb3IgcXVlcnlTZWxlY3RvcigpIGFuZCBxdWVy eVNlbGVjdG9yQWxsKCksIGRvIG5vdCBjYWxsIGJhY2tlbmQgZGlyZWN0bHkKKyAgICAgICAgLSBt aW5vciBzdHlsZSBmaXhlcyBpbiBJbnNwZWN0b3IuanNvbgorICAgICAgICAtIG1vcmUgZXJyb3Ig bG9nZ2luZworCisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uOgorICAgICAgICAq IGluc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNw ZWN0b3JET01BZ2VudDo6bm9kZVRvU2VsZWN0T24pOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9u dC1lbmQvQXVkaXRSdWxlcy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5BdWRpdFJ1bGVzLklt YWdlRGltZW5zaW9uc1J1bGUucHJvdG90eXBlLmRvUnVuKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5BdWRpdFJ1bGVzLkltYWdlRGltZW5zaW9uc1J1bGUucHJvdG90eXBlLmRvUnVuLmdldFN0eWxl cyk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9DU1NTdHlsZU1vZGVsLmpzOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkNTU1N0eWxlTW9kZWwucHJvdG90eXBlLnNldFJ1bGVTZWxlY3Rv ci5jYWxsYmFjayk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ1NTU3R5bGVNb2RlbC5wcm90b3R5 cGUuc2V0UnVsZVNlbGVjdG9yKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5DU1NTdHlsZU1vZGVs LnByb3RvdHlwZS5hZGRSdWxlLmNhbGxiYWNrKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5DU1NT dHlsZU1vZGVsLnByb3RvdHlwZS5hZGRSdWxlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQt ZW5kL0RPTUFnZW50LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTUFnZW50LnByb3RvdHlw ZS5yZXF1ZXN0RG9jdW1lbnQub25Eb2N1bWVudEF2YWlsYWJsZSk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuRE9NQWdlbnQucHJvdG90eXBlLnJlcXVlc3REb2N1bWVudCk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuRE9NQWdlbnQucHJvdG90eXBlLnB1c2hOb2RlVG9Gcm9udGVuZCk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuRE9NQWdlbnQucHJvdG90eXBlLnB1c2hOb2RlQnlQYXRoVG9Gcm9udGVu ZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRE9NQWdlbnQucHJvdG90eXBlLl9kaXNwYXRjaFdo ZW5Eb2N1bWVudEF2YWlsYWJsZS5jYWxsYmFja1dyYXBwZXIpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLkRPTUFnZW50LnByb3RvdHlwZS5fZGlzcGF0Y2hXaGVuRG9jdW1lbnRBdmFpbGFibGUub25E b2N1bWVudEF2YWlsYWJsZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRE9NQWdlbnQucHJvdG90 eXBlLl9kaXNwYXRjaFdoZW5Eb2N1bWVudEF2YWlsYWJsZSk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuRE9NQWdlbnQucHJvdG90eXBlLmNhbmNlbFNlYXJjaCk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuRE9NQWdlbnQucHJvdG90eXBlLnF1ZXJ5U2VsZWN0b3IpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLkRPTUFnZW50LnByb3RvdHlwZS5xdWVyeVNlbGVjdG9yQWxsKToKKwogMjAxMS0wMy0yOCAg RXZhbiBNYXJ0aW4gIDxldmFuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBS eW9zdWtlIE5pd2EuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yLmpzb24gYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24KaW5kZXgg YTY2MzMxYS4uZTk0YTYzZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3Rvci5qc29uCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNv bgpAQCAtMTc4LDcgKzE3OCw3IEBACiAgICAgICAgICAgICB9LAogICAgICAgICAgICAgewogICAg ICAgICAgICAgICAgICJuYW1lIjogImRpc2FibGUiCi0gICAgICAgICAgIH0sCisgICAgICAgICAg ICB9LAogICAgICAgICAgICAgewogICAgICAgICAgICAgICAgICJuYW1lIjogImNsZWFyQ29uc29s ZU1lc3NhZ2VzIgogICAgICAgICAgICAgfSwKQEAgLTIwMiw3ICsyMDIsNyBAQAogICAgICAgICAg ICAgICAgICAgICB7ICJuYW1lIjogIm1lc3NhZ2VPYmoiLCAiJHJlZiI6ICJDb25zb2xlTWVzc2Fn ZSIgfQogICAgICAgICAgICAgICAgIF0KICAgICAgICAgICAgIH0sCi0gICAgICAgICAgIHsKKyAg ICAgICAgICAgIHsKICAgICAgICAgICAgICAgICAibmFtZSI6ICJjb25zb2xlTWVzc2FnZVJlcGVh dENvdW50VXBkYXRlZCIsCiAgICAgICAgICAgICAgICAgInBhcmFtZXRlcnMiOiBbCiAgICAgICAg ICAgICAgICAgICAgIHsgIm5hbWUiOiAiY291bnQiLCAidHlwZSI6ICJpbnRlZ2VyIiB9CkBAIC02 NDUsMTQgKzY0NSwxNCBAQAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImRvY3VtZW50 V2lkZSIsICJ0eXBlIjogImJvb2xlYW4iLCAiZGVzY3JpcHRpb24iOiAiU2V0IHRvIHRydWUgdG8g c3RhcnQgcXVlcnlpbmcgZnJvbSB0aGUgbm9kZSdzIGRvY3VtZW50LiIgfQogICAgICAgICAgICAg ICAgIF0sCiAgICAgICAgICAgICAgICAgInJldHVybnMiOiBbCi0gICAgICAgICAgICAgICAgICAg IHsgIm5hbWUiOiAibm9kZUlkcyIsICJ0eXBlIjogImFycmF5IiwgIml0ZW1zIjogeyAidHlwZSI6 ICJpbnRlZ2VyIiB9LCAiZGVzY3JpcHRpb24iOiAiUXVlcnkgc2VsZWN0b3IgcmVzdWx0LiIgIH0K KyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJub2RlSWRzIiwgInR5cGUiOiAiYXJyYXki LCAiaXRlbXMiOiB7ICJ0eXBlIjogImludGVnZXIiIH0sICJkZXNjcmlwdGlvbiI6ICJRdWVyeSBz ZWxlY3RvciByZXN1bHQuIiB9CiAgICAgICAgICAgICAgICAgXSwKICAgICAgICAgICAgICAgICAi ZGVzY3JpcHRpb24iOiAiRXhlY3V0ZXMgPGNvZGU+cXVlcnlTZWxlY3RvckFsbDwvY29kZT4gb24g YSBnaXZlbiBub2RlLiBTZXR0aW5nIDxjb2RlPmRvY3VtZW50V2lkZTwvY29kZT4gdG8gdHJ1ZSBz dGFydHMgc2VsZWN0aW5nIGZyb20gdGhlIGRvY3VtZW50IG5vZGUuIgogICAgICAgICAgICAgfSwK ICAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICAibmFtZSI6ICJzZXROb2RlTmFtZSIsCiAg ICAgICAgICAgICAgICAgInBhcmFtZXRlcnMiOiBbCi0gICAgICAgICAgICAgICAgICAgIHsgIm5h bWUiOiAibm9kZUlkIiwgInR5cGUiOiAiaW50ZWdlciIsICJkZXNjcmlwdGlvbiI6ICJJZCBvZiB0 aGUgbm9kZSB0byBzZXQgbmFtZSBmb3IuIiAgfSwKKyAgICAgICAgICAgICAgICAgICAgeyAibmFt ZSI6ICJub2RlSWQiLCAidHlwZSI6ICJpbnRlZ2VyIiwgImRlc2NyaXB0aW9uIjogIklkIG9mIHRo ZSBub2RlIHRvIHNldCBuYW1lIGZvci4iIH0sCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUi OiAibmFtZSIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJOZXcgbm9kZSdzIG5h bWUuIiB9CiAgICAgICAgICAgICAgICAgXSwKICAgICAgICAgICAgICAgICAicmV0dXJucyI6IFsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuY3BwCmluZGV4 IDViMzJkOWIuLmNjMGFmMDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JET01BZ2VudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3RvckRPTUFnZW50LmNwcApAQCAtNDI5LDE4ICs0MjksOCBAQCBIVE1MRWxlbWVudCogSW5zcGVj dG9yRE9NQWdlbnQ6OmFzc2VydEhUTUxFbGVtZW50KEVycm9yU3RyaW5nKiBlcnJvclN0cmluZywg aW50CiAKIE5vZGUqIEluc3BlY3RvckRPTUFnZW50Ojpub2RlVG9TZWxlY3RPbihFcnJvclN0cmlu ZyogZXJyb3JTdHJpbmcsIGludCBub2RlSWQsIGJvb2wgZG9jdW1lbnRXaWRlKQogewotICAgIE5v ZGUqIG5vZGU7Ci0gICAgaWYgKCFub2RlSWQpIHsKLSAgICAgICAgbm9kZSA9IG1fZG9jdW1lbnQu Z2V0KCk7Ci0gICAgICAgIGlmICghbm9kZSkKLSAgICAgICAgICAgICplcnJvclN0cmluZyA9ICJO byBkb2N1bWVudCB0byBxdWVyeSBvbi4iOwotICAgIH0gZWxzZQotICAgICAgICBub2RlID0gYXNz ZXJ0Tm9kZShlcnJvclN0cmluZywgbm9kZUlkKTsKLQotICAgIGlmICghbm9kZSkKLSAgICAgICAg cmV0dXJuIDA7Ci0KLSAgICBpZiAoZG9jdW1lbnRXaWRlICYmIG5vZGVJZCkKKyAgICBOb2RlKiBu b2RlID0gYXNzZXJ0Tm9kZShlcnJvclN0cmluZywgbm9kZUlkKTsKKyAgICBpZiAoZG9jdW1lbnRX aWRlICYmIG5vZGUgJiYgbm9kZS0+b3duZXJEb2N1bWVudCgpKQogICAgICAgICBub2RlID0gbm9k ZS0+b3duZXJEb2N1bWVudCgpOwogICAgIHJldHVybiBub2RlOwogfQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9BdWRpdFJ1bGVzLmpzIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9BdWRpdFJ1bGVzLmpzCmluZGV4IGI2MTQyNTYuLmEy OWMxZjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQXVk aXRSdWxlcy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0F1ZGl0 UnVsZXMuanMKQEAgLTY2Nyw2ICs2NjcsMTAgQEAgV2ViSW5zcGVjdG9yLkF1ZGl0UnVsZXMuSW1h Z2VEaW1lbnNpb25zUnVsZS5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgZnVuY3Rpb24gaW1hZ2VT dHlsZXNSZWFkeShpbWFnZUlkLCBsYXN0Q2FsbCwgc3R5bGVzKQogICAgICAgICB7CisgICAgICAg ICAgICBpZiAoIWltYWdlSWQpIHsKKyAgICAgICAgICAgICAgICBjb25zb2xlLmVycm9yKCJGYWls ZWQgdG8gZ2V0IGltYWdlIHN0eWxlIik7CisgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAg ICAgICAgfQogICAgICAgICAgICAgY29uc3Qgbm9kZSA9IFdlYkluc3BlY3Rvci5kb21BZ2VudC5u b2RlRm9ySWQoaW1hZ2VJZCk7CiAgICAgICAgICAgICB2YXIgc3JjID0gbm9kZS5nZXRBdHRyaWJ1 dGUoInNyYyIpOwogICAgICAgICAgICAgaWYgKCFzcmMuYXNQYXJzZWRVUkwoKSkgewpAQCAtNzE3 LDE1ICs3MjEsMTcgQEAgV2ViSW5zcGVjdG9yLkF1ZGl0UnVsZXMuSW1hZ2VEaW1lbnNpb25zUnVs ZS5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAgICAgZG9uZUNhbGxiYWNrKCk7CiAgICAgICAg IH0KIAotICAgICAgICBmdW5jdGlvbiBnZXRTdHlsZXMoZXJyb3IsIG5vZGVJZHMpCisgICAgICAg IGZ1bmN0aW9uIGdldFN0eWxlcyhub2RlSWRzKQogICAgICAgICB7Ci0gICAgICAgICAgICBpZiAo ZXJyb3IpCisgICAgICAgICAgICBpZiAoIW5vZGVJZHMpIHsKKyAgICAgICAgICAgICAgICBjb25z b2xlLmVycm9yKCJGYWlsZWQgdG8gZ2V0IHN0eWxlcyIpOwogICAgICAgICAgICAgICAgIHJldHVy bjsKKyAgICAgICAgICAgIH0KICAgICAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgbm9kZUlk cy5sZW5ndGg7ICsraSkKICAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3IuY3NzTW9kZWwuZ2V0 U3R5bGVzQXN5bmMobm9kZUlkc1tpXSwgaW1hZ2VTdHlsZXNSZWFkeS5iaW5kKHRoaXMsIG5vZGVJ ZHNbaV0sIGkgPT09IG5vZGVJZHMubGVuZ3RoIC0gMSkpOwogICAgICAgICB9CiAKLSAgICAgICAg RE9NQWdlbnQucXVlcnlTZWxlY3RvckFsbCgwLCAiaW1nW3NyY10iLCB0cnVlLCBnZXRTdHlsZXMp OworICAgICAgICBXZWJJbnNwZWN0b3IuZG9tQWdlbnQucXVlcnlTZWxlY3RvckFsbCgwLCAiaW1n W3NyY10iLCB0cnVlLCBnZXRTdHlsZXMpOwogICAgIH0KIH0KIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9DU1NTdHlsZU1vZGVsLmpzIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9DU1NTdHlsZU1vZGVsLmpzCmluZGV4IGZiYWY1YmMu LmYyOGM2M2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv Q1NTU3R5bGVNb2RlbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0NTU1N0eWxlTW9kZWwuanMKQEAgLTEzMCw3ICsxMzAsNyBAQCBXZWJJbnNwZWN0b3IuQ1NTU3R5 bGVNb2RlbC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBpZiAoZXJyb3IpCiAgICAgICAgICAg ICAgICAgZmFpbHVyZUNhbGxiYWNrKCk7CiAgICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAg ICAgRE9NQWdlbnQucXVlcnlTZWxlY3RvckFsbChub2RlSWQsIG5ld1NlbGVjdG9yLCB0cnVlLCBj aGVja0FmZmVjdHNDYWxsYmFjay5iaW5kKHRoaXMsIG5vZGVJZCwgc3VjY2Vzc0NhbGxiYWNrLCBy dWxlUGF5bG9hZCkpOworICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5kb21BZ2VudC5xdWVy eVNlbGVjdG9yQWxsKG5vZGVJZCwgbmV3U2VsZWN0b3IsIHRydWUsIGNoZWNrQWZmZWN0c0NhbGxi YWNrLmJpbmQodGhpcywgbm9kZUlkLCBzdWNjZXNzQ2FsbGJhY2ssIHJ1bGVQYXlsb2FkKSk7CiAg ICAgICAgIH0KIAogICAgICAgICBDU1NBZ2VudC5zZXRSdWxlU2VsZWN0b3IocnVsZUlkLCBuZXdT ZWxlY3RvciwgY2FsbGJhY2suYmluZCh0aGlzLCBub2RlSWQsIHN1Y2Nlc3NDYWxsYmFjaywgZmFp bHVyZUNhbGxiYWNrLCBuZXdTZWxlY3RvcikpOwpAQCAtMTUyLDcgKzE1Miw3IEBAIFdlYkluc3Bl Y3Rvci5DU1NTdHlsZU1vZGVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICAvLyBJbnZh bGlkIHN5bnRheCBmb3IgYSBzZWxlY3RvcgogICAgICAgICAgICAgICAgIGZhaWx1cmVDYWxsYmFj aygpOwogICAgICAgICAgICAgfSBlbHNlCi0gICAgICAgICAgICAgICAgRE9NQWdlbnQucXVlcnlT ZWxlY3RvckFsbChub2RlSWQsIHNlbGVjdG9yLCB0cnVlLCBjaGVja0FmZmVjdHNDYWxsYmFjay5i aW5kKHRoaXMsIG5vZGVJZCwgc3VjY2Vzc0NhbGxiYWNrLCBydWxlUGF5bG9hZCkpOworICAgICAg ICAgICAgICAgIFdlYkluc3BlY3Rvci5kb21BZ2VudC5xdWVyeVNlbGVjdG9yQWxsKG5vZGVJZCwg c2VsZWN0b3IsIHRydWUsIGNoZWNrQWZmZWN0c0NhbGxiYWNrLmJpbmQodGhpcywgbm9kZUlkLCBz dWNjZXNzQ2FsbGJhY2ssIHJ1bGVQYXlsb2FkKSk7CiAgICAgICAgIH0KIAogICAgICAgICBDU1NB Z2VudC5hZGRSdWxlKG5vZGVJZCwgc2VsZWN0b3IsIGNhbGxiYWNrLmJpbmQodGhpcywgc3VjY2Vz c0NhbGxiYWNrLCBmYWlsdXJlQ2FsbGJhY2ssIHNlbGVjdG9yKSk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RPTUFnZW50LmpzIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9ET01BZ2VudC5qcwppbmRleCBhMmE5YzJkLi4wOTAxMTA2 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RPTUFnZW50 LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRE9NQWdlbnQuanMK QEAgLTMyOCw3ICszMjgsNyBAQCBXZWJJbnNwZWN0b3IuRE9NQWdlbnQucHJvdG90eXBlID0gewog ICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKLSAgICAgICAgZnVuY3Rpb24gbXljYWxs YmFjayhlcnJvciwgcm9vdCkKKyAgICAgICAgZnVuY3Rpb24gb25Eb2N1bWVudEF2YWlsYWJsZShl cnJvciwgcm9vdCkKICAgICAgICAgewogICAgICAgICAgICAgaWYgKCFlcnJvcikKICAgICAgICAg ICAgICAgICB0aGlzLl9zZXREb2N1bWVudChyb290KTsKQEAgLTMzNiw0NCArMzM2LDQyIEBAIFdl Ykluc3BlY3Rvci5ET01BZ2VudC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBpZiAoY2FsbGJh Y2spCiAgICAgICAgICAgICAgICAgY2FsbGJhY2sodGhpcy5fZG9jdW1lbnQpOwogICAgICAgICB9 Ci0gICAgICAgIERPTUFnZW50LmdldERvY3VtZW50KG15Y2FsbGJhY2suYmluZCh0aGlzKSk7Cisg ICAgICAgIERPTUFnZW50LmdldERvY3VtZW50KG9uRG9jdW1lbnRBdmFpbGFibGUuYmluZCh0aGlz KSk7CiAgICAgfSwKIAogICAgIHB1c2hOb2RlVG9Gcm9udGVuZDogZnVuY3Rpb24ob2JqZWN0SWQs IGNhbGxiYWNrKQogICAgIHsKLSAgICAgICAgZnVuY3Rpb24gY2FsbGJhY2tXcmFwcGVyKGVycm9y LCBub2RlSWQpCi0gICAgICAgIHsKLSAgICAgICAgICAgIGlmIChjYWxsYmFjaykKLSAgICAgICAg ICAgICAgICBjYWxsYmFjayhlcnJvciA/IDAgOiBub2RlSWQpOwotICAgICAgICB9Ci0KLSAgICAg ICAgZnVuY3Rpb24gbXljYWxsYmFjaygpCi0gICAgICAgIHsKLSAgICAgICAgICAgIGlmICh0aGlz Ll9kb2N1bWVudCkKLSAgICAgICAgICAgICAgICBET01BZ2VudC5wdXNoTm9kZVRvRnJvbnRlbmQo b2JqZWN0SWQsIGNhbGxiYWNrV3JhcHBlcik7Ci0gICAgICAgICAgICBlbHNlCi0gICAgICAgICAg ICAgICAgY2FsbGJhY2tXcmFwcGVyKCJObyBkb2N1bWVudCIpOwotICAgICAgICB9Ci0KLSAgICAg ICAgdGhpcy5yZXF1ZXN0RG9jdW1lbnQobXljYWxsYmFjay5iaW5kKHRoaXMpKTsKKyAgICAgICAg dGhpcy5fZGlzcGF0Y2hXaGVuRG9jdW1lbnRBdmFpbGFibGUoRE9NQWdlbnQucHVzaE5vZGVUb0Zy b250ZW5kLmJpbmQoRE9NQWdlbnQpLCBvYmplY3RJZCwgY2FsbGJhY2spOwogICAgIH0sCiAKICAg ICBwdXNoTm9kZUJ5UGF0aFRvRnJvbnRlbmQ6IGZ1bmN0aW9uKHBhdGgsIGNhbGxiYWNrKQogICAg IHsKLSAgICAgICAgZnVuY3Rpb24gY2FsbGJhY2tXcmFwcGVyKGVycm9yLCBub2RlSWQpCi0gICAg ICAgIHsKLSAgICAgICAgICAgIGlmIChjYWxsYmFjaykKLSAgICAgICAgICAgICAgICBjYWxsYmFj ayhlcnJvciA/IDAgOiBub2RlSWQpOwotICAgICAgICB9CisgICAgICAgIHRoaXMuX2Rpc3BhdGNo V2hlbkRvY3VtZW50QXZhaWxhYmxlKERPTUFnZW50LnB1c2hOb2RlQnlQYXRoVG9Gcm9udGVuZC5i aW5kKERPTUFnZW50KSwgcGF0aCwgY2FsbGJhY2spOworICAgIH0sCisKKyAgICBfZGlzcGF0Y2hX aGVuRG9jdW1lbnRBdmFpbGFibGU6IGZ1bmN0aW9uKGFjdGlvbikKKyAgICB7CisgICAgICAgIHZh ciByZXF1ZXN0QXJndW1lbnRzID0gQXJyYXkucHJvdG90eXBlLnNsaWNlLmNhbGwoYXJndW1lbnRz LCAxKTsKKyAgICAgICAgdmFyIGNhbGxiYWNrV3JhcHBlcjsKIAotICAgICAgICBmdW5jdGlvbiBt eWNhbGxiYWNrKCkKKyAgICAgICAgaWYgKHR5cGVvZiByZXF1ZXN0QXJndW1lbnRzW3JlcXVlc3RB cmd1bWVudHMubGVuZ3RoIC0gMV0gPT09ICJmdW5jdGlvbiIpIHsKKyAgICAgICAgICAgIHZhciBj bGllbnRDYWxsYmFjayA9IHJlcXVlc3RBcmd1bWVudHMucG9wKCk7CisgICAgICAgICAgICBjYWxs YmFja1dyYXBwZXIgPSBmdW5jdGlvbihlcnJvciwgcmVzdWx0KQorICAgICAgICAgICAgeworICAg ICAgICAgICAgICAgIGNsaWVudENhbGxiYWNrKGVycm9yID8gbnVsbCA6IHJlc3VsdCk7CisgICAg ICAgICAgICB9CisgICAgICAgICAgICByZXF1ZXN0QXJndW1lbnRzLnB1c2goY2FsbGJhY2tXcmFw cGVyKTsKKyAgICAgICAgfQorICAgICAgICBmdW5jdGlvbiBvbkRvY3VtZW50QXZhaWxhYmxlKCkK ICAgICAgICAgewogICAgICAgICAgICAgaWYgKHRoaXMuX2RvY3VtZW50KQotICAgICAgICAgICAg ICAgIERPTUFnZW50LnB1c2hOb2RlQnlQYXRoVG9Gcm9udGVuZChwYXRoLCBjYWxsYmFja1dyYXBw ZXIpOwotICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAgIGNhbGxiYWNrV3JhcHBlcigi Tm8gZG9jdW1lbnQiKTsKKyAgICAgICAgICAgICAgICBhY3Rpb24uYXBwbHkobnVsbCwgcmVxdWVz dEFyZ3VtZW50cyk7CisgICAgICAgICAgICBlbHNlIHsgCisgICAgICAgICAgICAgICAgaWYgKGNh bGxiYWNrV3JhcHBlcikKKyAgICAgICAgICAgICAgICAgICAgY2FsbGJhY2tXcmFwcGVyKCJObyBk b2N1bWVudCIpOworICAgICAgICAgICAgfQogICAgICAgICB9Ci0gICAgICAgIHRoaXMucmVxdWVz dERvY3VtZW50KG15Y2FsbGJhY2suYmluZCh0aGlzKSk7CisgICAgICAgIHRoaXMucmVxdWVzdERv Y3VtZW50KG9uRG9jdW1lbnRBdmFpbGFibGUuYmluZCh0aGlzKSk7CiAgICAgfSwKIAogICAgIF9h dHRyaWJ1dGVzVXBkYXRlZDogZnVuY3Rpb24obm9kZUlkLCBhdHRyc0FycmF5KQpAQCAtNDg4LDYg KzQ4NiwyNCBAQCBXZWJJbnNwZWN0b3IuRE9NQWdlbnQucHJvdG90eXBlID0gewogICAgIHsKICAg ICAgICAgZGVsZXRlIHRoaXMuX3NlYXJjaFJlc3VsdENvbGxlY3RvcjsKICAgICAgICAgRE9NQWdl bnQuY2FuY2VsU2VhcmNoKCk7CisgICAgfSwKKworICAgIHF1ZXJ5U2VsZWN0b3I6IGZ1bmN0aW9u KG5vZGVJZCwgc2VsZWN0b3JzLCBkb2N1bWVudFdpZGUsIGNhbGxiYWNrKQorICAgIHsKKyAgICAg ICAgZnVuY3Rpb24gb25Eb2N1bWVudEF2YWlsYWJsZSh3cmFwcGVkQ2FsbGJhY2spCisgICAgICAg IHsKKyAgICAgICAgICAgIERPTUFnZW50LnF1ZXJ5U2VsZWN0b3Iobm9kZUlkIHx8IHRoaXMuX2Rv Y3VtZW50LmlkLCBzZWxlY3RvcnMsIGRvY3VtZW50V2lkZSwgd3JhcHBlZENhbGxiYWNrKTsKKyAg ICAgICAgfQorICAgICAgICB0aGlzLl9kaXNwYXRjaFdoZW5Eb2N1bWVudEF2YWlsYWJsZShvbkRv Y3VtZW50QXZhaWxhYmxlLmJpbmQodGhpcyksIGNhbGxiYWNrKTsKKyAgICB9LAorCisgICAgcXVl cnlTZWxlY3RvckFsbDogZnVuY3Rpb24obm9kZUlkLCBzZWxlY3RvcnMsIGRvY3VtZW50V2lkZSwg Y2FsbGJhY2spCisgICAgeworICAgICAgICBmdW5jdGlvbiBvbkRvY3VtZW50QXZhaWxhYmxlKHdy YXBwZWRDYWxsYmFjaykKKyAgICAgICAgeworICAgICAgICAgICAgRE9NQWdlbnQucXVlcnlTZWxl Y3RvckFsbChub2RlSWQgfHwgdGhpcy5fZG9jdW1lbnQuaWQsIHNlbGVjdG9ycywgZG9jdW1lbnRX aWRlLCB3cmFwcGVkQ2FsbGJhY2spOworICAgICAgICB9CisgICAgICAgIHRoaXMuX2Rpc3BhdGNo V2hlbkRvY3VtZW50QXZhaWxhYmxlKG9uRG9jdW1lbnRBdmFpbGFibGUuYmluZCh0aGlzKSwgY2Fs bGJhY2spOwogICAgIH0KIH0KIAo= 87540 2011-03-30 08:26:22 -0700 2011-03-30 08:27:00 -0700 patch audits-fix-trivial.diff text/plain 2478 caseq ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA1YmEzNDA4Li5hMzk1YzdjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTEtMDMt MzAgIEFuZHJleSBLb3N5YWtvdiAgPGNhc2VxQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBhdWRpdCBy dW4gbmV2ZXIgY29tcGxldGVzLCBmYWlscyBpbiBET01BZ2VudC5qcworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTczNDkKKworICAgICAgICAqIGluc3Bl Y3Rvci9hdWRpdHMvYXVkaXRzLXBhbmVsLWZ1bmN0aW9uYWwuaHRtbDogZG8gbm90IHNlbGVjdCBF bGVtZW50cyBwYW5lbCBiZWZvcmUgcnVubmluZyBBdWRpdHMsIHRoaXMgaGlkZXMgYnVnIDU3MzQ5 CisKIDIwMTEtMDMtMzAgIExldmkgV2VpbnRyYXViICA8bGV2aXdAY2hyb21pdW0ub3JnPgogCiAg ICAgICAgIFJldmlld2VkIGJ5IFJ5b3N1a2UgTml3YS4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L2luc3BlY3Rvci9hdWRpdHMvYXVkaXRzLXBhbmVsLWZ1bmN0aW9uYWwuaHRtbCBiL0xheW91dFRl c3RzL2luc3BlY3Rvci9hdWRpdHMvYXVkaXRzLXBhbmVsLWZ1bmN0aW9uYWwuaHRtbAppbmRleCA3 YzlmMmViLi41MGRlYzJmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvYXVkaXRz L2F1ZGl0cy1wYW5lbC1mdW5jdGlvbmFsLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9y L2F1ZGl0cy9hdWRpdHMtcGFuZWwtZnVuY3Rpb25hbC5odG1sCkBAIC0xNiw4ICsxNiw2IEBACiA8 c2NyaXB0PgogdmFyIHRlc3QgPSBmdW5jdGlvbigpCiB7Ci0gICAgV2ViSW5zcGVjdG9yLnNob3dQ YW5lbCgiZWxlbWVudHMiKTsKLQogICAgIEluc3BlY3RvclRlc3QucmVsb2FkUGFnZShzdGVwMSk7 CiAKICAgICBmdW5jdGlvbiBzdGVwMSgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFu Z2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2JiZGJjOC4uNDM0NzhhMCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3Jl L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDExLTAzLTMwICBBbmRyZXkgS29zeWFrb3Yg IDxjYXNlcUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogYXVkaXQgcnVuIG5ldmVyIGNvbXBsZXRlcywg ZmFpbHMgaW4gRE9NQWdlbnQuanMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTU3MzQ5CisKKyAgICAgICAgLSBhc3N1cmUgZG9jdW1lbnQgaXMgcHJlc2Vu dCBiZWZvcmUgY2FsbGluZyBET01BZ2VudC5xdWVyeVNlbGVjdEFsbCgpCisKKyAgICAgICAgKiBp bnNwZWN0b3IvZnJvbnQtZW5kL0F1ZGl0UnVsZXMuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu QXVkaXRSdWxlcy5JbWFnZURpbWVuc2lvbnNSdWxlLnByb3RvdHlwZS5kb1J1bik6CisKIDIwMTEt MDMtMzAgIFN0ZXZlIEJsb2NrICA8c3RldmVibG9ja0Bnb29nbGUuY29tPgogCiAgICAgICAgIFJl dmlld2VkIGJ5IEplcmVteSBPcmxvdy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvQXVkaXRSdWxlcy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvQXVkaXRSdWxlcy5qcwppbmRleCBmM2UyOGQ4Li5kZGFiMWRmIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0F1ZGl0UnVsZXMuanMKKysrIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9BdWRpdFJ1bGVzLmpzCkBAIC03Mjks NyArNzI5LDEyIEBAIFdlYkluc3BlY3Rvci5BdWRpdFJ1bGVzLkltYWdlRGltZW5zaW9uc1J1bGUu cHJvdG90eXBlID0gewogICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5jc3NNb2RlbC5nZXRT dHlsZXNBc3luYyhub2RlSWRzW2ldLCBpbWFnZVN0eWxlc1JlYWR5LmJpbmQodGhpcywgbm9kZUlk c1tpXSwgaSA9PT0gbm9kZUlkcy5sZW5ndGggLSAxKSk7CiAgICAgICAgIH0KIAotICAgICAgICBE T01BZ2VudC5xdWVyeVNlbGVjdG9yQWxsKDAsICJpbWdbc3JjXSIsIHRydWUsIGdldFN0eWxlcyk7 CisgICAgICAgIGZ1bmN0aW9uIGdldEltYWdlcygpCisgICAgICAgIHsKKyAgICAgICAgICAgIERP TUFnZW50LnF1ZXJ5U2VsZWN0b3JBbGwoMCwgImltZ1tzcmNdIiwgdHJ1ZSwgZ2V0U3R5bGVzKTsK KyAgICAgICAgfQorCisgICAgICAgIFdlYkluc3BlY3Rvci5kb21BZ2VudC5yZXF1ZXN0RG9jdW1l bnQoZ2V0SW1hZ2VzKTsKICAgICB9CiB9CiAK