42490 2010-07-16 17:29:47 -0700 Use OwnPtr for CodeBlock objects 2010-07-19 10:19:34 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 darin darin oldest_to_newest 252781 0 darin 2010-07-16 17:29:47 -0700 Use OwnPtr for CodeBlock objects 252785 1 61865 darin 2010-07-16 17:33:55 -0700 Created attachment 61865 Patch 253281 2 darin 2010-07-19 10:19:34 -0700 Committed r63675: <http://trac.webkit.org/changeset/63675> 61865 2010-07-16 17:33:55 -0700 2010-07-16 21:27:40 -0700 Patch bug-42490-20100716173354.patch text/plain 13143 darin SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDYzNjAwKQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjkgQEAKKzIwMTAtMDctMTYgIERhcmluIEFk bGVyICA8ZGFyaW5AYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFVzZSBPd25QdHIgZm9yIENvZGVCbG9jayBvYmplY3RzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MjQ5MAorCisgICAgICAg ICogcnVudGltZS9FeGVjdXRhYmxlLmNwcDoKKyAgICAgICAgKEpTQzo6RXZhbEV4ZWN1dGFibGU6 OkV2YWxFeGVjdXRhYmxlKTogTW92ZWQgdGhpcyBoZXJlIGFuZCBtYWRlIGl0IG5vbi1pbmxpbmUu CisgICAgICAgIEVsaW1pbmF0ZWQgdGhlIGNvZGUgdGhhdCB1c2VkIHRvIGluaXRpYWxpemUgdGhl IHJhdyBwb2ludGVyIHNpbmNlIGl0J3Mgbm93CisgICAgICAgIGFuIE93blB0ci4KKyAgICAgICAg KEpTQzo6RXZhbEV4ZWN1dGFibGU6On5FdmFsRXhlY3V0YWJsZSk6IFJlbW92ZWQgdGhlIGV4cGxp Y2l0IGRlbGV0ZSBoZXJlLgorICAgICAgICAoSlNDOjpQcm9ncmFtRXhlY3V0YWJsZTo6UHJvZ3Jh bUV4ZWN1dGFibGUpOiBEaXR0by4KKyAgICAgICAgKEpTQzo6UHJvZ3JhbUV4ZWN1dGFibGU6On5Q cm9ncmFtRXhlY3V0YWJsZSk6IERpdHRvLgorICAgICAgICAoSlNDOjpGdW5jdGlvbkV4ZWN1dGFi bGU6OkZ1bmN0aW9uRXhlY3V0YWJsZSk6IERpdHRvLgorICAgICAgICAoSlNDOjpGdW5jdGlvbkV4 ZWN1dGFibGU6On5GdW5jdGlvbkV4ZWN1dGFibGUpOiBEaXR0by4KKyAgICAgICAgKEpTQzo6RXZh bEV4ZWN1dGFibGU6OmNvbXBpbGVJbnRlcm5hbCk6IEFkZGVkIHVzZSBvZiBhZG9wdFB0ciBhbmQg Z2V0LgorICAgICAgICAoSlNDOjpQcm9ncmFtRXhlY3V0YWJsZTo6Y29tcGlsZUludGVybmFsKTog RGl0dG8uCisgICAgICAgIChKU0M6OkZ1bmN0aW9uRXhlY3V0YWJsZTo6Y29tcGlsZUZvckNhbGxJ bnRlcm5hbCk6IERpdHRvLgorICAgICAgICAoSlNDOjpGdW5jdGlvbkV4ZWN1dGFibGU6OmNvbXBp bGVGb3JDb25zdHJ1Y3RJbnRlcm5hbCk6IERpdHRvLgorICAgICAgICAoSlNDOjpGdW5jdGlvbkV4 ZWN1dGFibGU6OnJlY29tcGlsZSk6IFVzZSBjbGVhciBpbnN0ZWFkIG9mIGRlbGV0ZSBmb2xsb3dl ZAorICAgICAgICBieSBhc3NpZ25tZW50IG9mIDAuCisKKyAgICAgICAgKiBydW50aW1lL0V4ZWN1 dGFibGUuaDogTW92ZWQgY29uc3RydWN0b3JzIHRvIHRoZSBjcHAgZmlsZSBhbmQgY2hhbmdlZAor ICAgICAgICByYXcgcG9pbnRlcnMgdG8gT3duUHRyLgorCiAyMDEwLTA3LTE2ICBMZWFuZHJvIFBl cmVpcmEgIDxsZWFuZHJvQHByb2Z1c2lvbi5tb2JpPgogCiAgICAgICAgIFtFRkxdIFVucmV2aWV3 ZWQgYnVpbGQgc3lzdGVtIGNsZWFudXAuCkluZGV4OiBKYXZhU2NyaXB0Q29yZS9ydW50aW1lL0V4 ZWN1dGFibGUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEphdmFTY3JpcHRDb3JlL3J1bnRpbWUvRXhlY3V0 YWJsZS5jcHAJKHJldmlzaW9uIDYzNTk5KQorKysgSmF2YVNjcmlwdENvcmUvcnVudGltZS9FeGVj dXRhYmxlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDUsMjAgKzQ1LDUwIEBAIFZQdHJIYWNrRXhl Y3V0YWJsZTo6flZQdHJIYWNrRXhlY3V0YWJsZSgKIHsKIH0KIAorRXZhbEV4ZWN1dGFibGU6OkV2 YWxFeGVjdXRhYmxlKEV4ZWNTdGF0ZSogZXhlYywgY29uc3QgU291cmNlQ29kZSYgc291cmNlKQor ICAgIDogU2NyaXB0RXhlY3V0YWJsZShleGVjLCBzb3VyY2UpCit7Cit9CisKIEV2YWxFeGVjdXRh YmxlOjp+RXZhbEV4ZWN1dGFibGUoKQogewotICAgIGRlbGV0ZSBtX2V2YWxDb2RlQmxvY2s7Cit9 CisKK1Byb2dyYW1FeGVjdXRhYmxlOjpQcm9ncmFtRXhlY3V0YWJsZShFeGVjU3RhdGUqIGV4ZWMs IGNvbnN0IFNvdXJjZUNvZGUmIHNvdXJjZSkKKyAgICA6IFNjcmlwdEV4ZWN1dGFibGUoZXhlYywg c291cmNlKQorewogfQogCiBQcm9ncmFtRXhlY3V0YWJsZTo6flByb2dyYW1FeGVjdXRhYmxlKCkK IHsKLSAgICBkZWxldGUgbV9wcm9ncmFtQ29kZUJsb2NrOworfQorCitGdW5jdGlvbkV4ZWN1dGFi bGU6OkZ1bmN0aW9uRXhlY3V0YWJsZShKU0dsb2JhbERhdGEqIGdsb2JhbERhdGEsIGNvbnN0IElk ZW50aWZpZXImIG5hbWUsIGNvbnN0IFNvdXJjZUNvZGUmIHNvdXJjZSwgYm9vbCBmb3JjZVVzZXNB cmd1bWVudHMsIEZ1bmN0aW9uUGFyYW1ldGVycyogcGFyYW1ldGVycywgaW50IGZpcnN0TGluZSwg aW50IGxhc3RMaW5lKQorICAgIDogU2NyaXB0RXhlY3V0YWJsZShnbG9iYWxEYXRhLCBzb3VyY2Up CisgICAgLCBtX251bVZhcmlhYmxlcygwKQorICAgICwgbV9mb3JjZVVzZXNBcmd1bWVudHMoZm9y Y2VVc2VzQXJndW1lbnRzKQorICAgICwgbV9wYXJhbWV0ZXJzKHBhcmFtZXRlcnMpCisgICAgLCBt X25hbWUobmFtZSkKKyAgICAsIG1fc3ltYm9sVGFibGUoMCkKK3sKKyAgICBtX2ZpcnN0TGluZSA9 IGZpcnN0TGluZTsKKyAgICBtX2xhc3RMaW5lID0gbGFzdExpbmU7Cit9CisKK0Z1bmN0aW9uRXhl Y3V0YWJsZTo6RnVuY3Rpb25FeGVjdXRhYmxlKEV4ZWNTdGF0ZSogZXhlYywgY29uc3QgSWRlbnRp ZmllciYgbmFtZSwgY29uc3QgU291cmNlQ29kZSYgc291cmNlLCBib29sIGZvcmNlVXNlc0FyZ3Vt ZW50cywgRnVuY3Rpb25QYXJhbWV0ZXJzKiBwYXJhbWV0ZXJzLCBpbnQgZmlyc3RMaW5lLCBpbnQg bGFzdExpbmUpCisgICAgOiBTY3JpcHRFeGVjdXRhYmxlKGV4ZWMsIHNvdXJjZSkKKyAgICAsIG1f bnVtVmFyaWFibGVzKDApCisgICAgLCBtX2ZvcmNlVXNlc0FyZ3VtZW50cyhmb3JjZVVzZXNBcmd1 bWVudHMpCisgICAgLCBtX3BhcmFtZXRlcnMocGFyYW1ldGVycykKKyAgICAsIG1fbmFtZShuYW1l KQorICAgICwgbV9zeW1ib2xUYWJsZSgwKQoreworICAgIG1fZmlyc3RMaW5lID0gZmlyc3RMaW5l OworICAgIG1fbGFzdExpbmUgPSBsYXN0TGluZTsKIH0KIAogRnVuY3Rpb25FeGVjdXRhYmxlOjp+ RnVuY3Rpb25FeGVjdXRhYmxlKCkKIHsKLSAgICBkZWxldGUgbV9jb2RlQmxvY2tGb3JDYWxsOwot ICAgIGRlbGV0ZSBtX2NvZGVCbG9ja0ZvckNvbnN0cnVjdDsKIH0KIAogSlNPYmplY3QqIEV2YWxF eGVjdXRhYmxlOjpjb21waWxlSW50ZXJuYWwoRXhlY1N0YXRlKiBleGVjLCBTY29wZUNoYWluTm9k ZSogc2NvcGVDaGFpbk5vZGUpCkBAIC03NywxNSArMTA3LDE1IEBAIEpTT2JqZWN0KiBFdmFsRXhl Y3V0YWJsZTo6Y29tcGlsZUludGVybmEKICAgICBKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0 ID0gc2NvcGVDaGFpbi5nbG9iYWxPYmplY3QoKTsKIAogICAgIEFTU0VSVCghbV9ldmFsQ29kZUJs b2NrKTsKLSAgICBtX2V2YWxDb2RlQmxvY2sgPSBuZXcgRXZhbENvZGVCbG9jayh0aGlzLCBnbG9i YWxPYmplY3QsIHNvdXJjZSgpLnByb3ZpZGVyKCksIHNjb3BlQ2hhaW4ubG9jYWxEZXB0aCgpKTsK LSAgICBPd25QdHI8Qnl0ZWNvZGVHZW5lcmF0b3I+IGdlbmVyYXRvcihhZG9wdFB0cihuZXcgQnl0 ZWNvZGVHZW5lcmF0b3IoZXZhbE5vZGUuZ2V0KCksIGdsb2JhbE9iamVjdC0+ZGVidWdnZXIoKSwg c2NvcGVDaGFpbiwgbV9ldmFsQ29kZUJsb2NrLT5zeW1ib2xUYWJsZSgpLCBtX2V2YWxDb2RlQmxv Y2spKSk7CisgICAgbV9ldmFsQ29kZUJsb2NrID0gYWRvcHRQdHIobmV3IEV2YWxDb2RlQmxvY2so dGhpcywgZ2xvYmFsT2JqZWN0LCBzb3VyY2UoKS5wcm92aWRlcigpLCBzY29wZUNoYWluLmxvY2Fs RGVwdGgoKSkpOworICAgIE93blB0cjxCeXRlY29kZUdlbmVyYXRvcj4gZ2VuZXJhdG9yKGFkb3B0 UHRyKG5ldyBCeXRlY29kZUdlbmVyYXRvcihldmFsTm9kZS5nZXQoKSwgZ2xvYmFsT2JqZWN0LT5k ZWJ1Z2dlcigpLCBzY29wZUNoYWluLCBtX2V2YWxDb2RlQmxvY2stPnN5bWJvbFRhYmxlKCksIG1f ZXZhbENvZGVCbG9jay5nZXQoKSkpKTsKICAgICBnZW5lcmF0b3ItPmdlbmVyYXRlKCk7CiAgICAg CiAgICAgZXZhbE5vZGUtPmRlc3Ryb3lEYXRhKCk7CiAKICNpZiBFTkFCTEUoSklUKQogICAgIGlm IChleGVjLT5nbG9iYWxEYXRhKCkuY2FuVXNlSklUKCkpIHsKLSAgICAgICAgbV9qaXRDb2RlRm9y Q2FsbCA9IEpJVDo6Y29tcGlsZShzY29wZUNoYWluTm9kZS0+Z2xvYmFsRGF0YSwgbV9ldmFsQ29k ZUJsb2NrKTsKKyAgICAgICAgbV9qaXRDb2RlRm9yQ2FsbCA9IEpJVDo6Y29tcGlsZShzY29wZUNo YWluTm9kZS0+Z2xvYmFsRGF0YSwgbV9ldmFsQ29kZUJsb2NrLmdldCgpKTsKICNpZiAhRU5BQkxF KE9QQ09ERV9TQU1QTElORykKICAgICAgICAgaWYgKCFCeXRlY29kZUdlbmVyYXRvcjo6ZHVtcHNH ZW5lcmF0ZWRDb2RlKCkpCiAgICAgICAgICAgICBtX2V2YWxDb2RlQmxvY2stPmRpc2NhcmRCeXRl Y29kZSgpOwpAQCAtMTI1LDE1ICsxNTUsMTUgQEAgSlNPYmplY3QqIFByb2dyYW1FeGVjdXRhYmxl Ojpjb21waWxlSW50ZQogICAgIFNjb3BlQ2hhaW4gc2NvcGVDaGFpbihzY29wZUNoYWluTm9kZSk7 CiAgICAgSlNHbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCA9IHNjb3BlQ2hhaW4uZ2xvYmFsT2Jq ZWN0KCk7CiAgICAgCi0gICAgbV9wcm9ncmFtQ29kZUJsb2NrID0gbmV3IFByb2dyYW1Db2RlQmxv Y2sodGhpcywgR2xvYmFsQ29kZSwgZ2xvYmFsT2JqZWN0LCBzb3VyY2UoKS5wcm92aWRlcigpKTsK LSAgICBPd25QdHI8Qnl0ZWNvZGVHZW5lcmF0b3I+IGdlbmVyYXRvcihhZG9wdFB0cihuZXcgQnl0 ZWNvZGVHZW5lcmF0b3IocHJvZ3JhbU5vZGUuZ2V0KCksIGdsb2JhbE9iamVjdC0+ZGVidWdnZXIo KSwgc2NvcGVDaGFpbiwgJmdsb2JhbE9iamVjdC0+c3ltYm9sVGFibGUoKSwgbV9wcm9ncmFtQ29k ZUJsb2NrKSkpOworICAgIG1fcHJvZ3JhbUNvZGVCbG9jayA9IGFkb3B0UHRyKG5ldyBQcm9ncmFt Q29kZUJsb2NrKHRoaXMsIEdsb2JhbENvZGUsIGdsb2JhbE9iamVjdCwgc291cmNlKCkucHJvdmlk ZXIoKSkpOworICAgIE93blB0cjxCeXRlY29kZUdlbmVyYXRvcj4gZ2VuZXJhdG9yKGFkb3B0UHRy KG5ldyBCeXRlY29kZUdlbmVyYXRvcihwcm9ncmFtTm9kZS5nZXQoKSwgZ2xvYmFsT2JqZWN0LT5k ZWJ1Z2dlcigpLCBzY29wZUNoYWluLCAmZ2xvYmFsT2JqZWN0LT5zeW1ib2xUYWJsZSgpLCBtX3By b2dyYW1Db2RlQmxvY2suZ2V0KCkpKSk7CiAgICAgZ2VuZXJhdG9yLT5nZW5lcmF0ZSgpOwogCiAg ICAgcHJvZ3JhbU5vZGUtPmRlc3Ryb3lEYXRhKCk7CiAKICNpZiBFTkFCTEUoSklUKQogICAgIGlm IChleGVjLT5nbG9iYWxEYXRhKCkuY2FuVXNlSklUKCkpIHsKLSAgICAgICAgbV9qaXRDb2RlRm9y Q2FsbCA9IEpJVDo6Y29tcGlsZShzY29wZUNoYWluTm9kZS0+Z2xvYmFsRGF0YSwgbV9wcm9ncmFt Q29kZUJsb2NrKTsKKyAgICAgICAgbV9qaXRDb2RlRm9yQ2FsbCA9IEpJVDo6Y29tcGlsZShzY29w ZUNoYWluTm9kZS0+Z2xvYmFsRGF0YSwgbV9wcm9ncmFtQ29kZUJsb2NrLmdldCgpKTsKICNpZiAh RU5BQkxFKE9QQ09ERV9TQU1QTElORykKICAgICAgICAgaWYgKCFCeXRlY29kZUdlbmVyYXRvcjo6 ZHVtcHNHZW5lcmF0ZWRDb2RlKCkpCiAgICAgICAgICAgICBtX3Byb2dyYW1Db2RlQmxvY2stPmRp c2NhcmRCeXRlY29kZSgpOwpAQCAtMTYyLDggKzE5Miw4IEBAIEpTT2JqZWN0KiBGdW5jdGlvbkV4 ZWN1dGFibGU6OmNvbXBpbGVGb3IKICAgICBKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0ID0g c2NvcGVDaGFpbi5nbG9iYWxPYmplY3QoKTsKIAogICAgIEFTU0VSVCghbV9jb2RlQmxvY2tGb3JD YWxsKTsKLSAgICBtX2NvZGVCbG9ja0ZvckNhbGwgPSBuZXcgRnVuY3Rpb25Db2RlQmxvY2sodGhp cywgRnVuY3Rpb25Db2RlLCBzb3VyY2UoKS5wcm92aWRlcigpLCBzb3VyY2UoKS5zdGFydE9mZnNl dCgpLCBmYWxzZSk7Ci0gICAgT3duUHRyPEJ5dGVjb2RlR2VuZXJhdG9yPiBnZW5lcmF0b3IoYWRv cHRQdHIobmV3IEJ5dGVjb2RlR2VuZXJhdG9yKGJvZHkuZ2V0KCksIGdsb2JhbE9iamVjdC0+ZGVi dWdnZXIoKSwgc2NvcGVDaGFpbiwgbV9jb2RlQmxvY2tGb3JDYWxsLT5zeW1ib2xUYWJsZSgpLCBt X2NvZGVCbG9ja0ZvckNhbGwpKSk7CisgICAgbV9jb2RlQmxvY2tGb3JDYWxsID0gYWRvcHRQdHIo bmV3IEZ1bmN0aW9uQ29kZUJsb2NrKHRoaXMsIEZ1bmN0aW9uQ29kZSwgc291cmNlKCkucHJvdmlk ZXIoKSwgc291cmNlKCkuc3RhcnRPZmZzZXQoKSwgZmFsc2UpKTsKKyAgICBPd25QdHI8Qnl0ZWNv ZGVHZW5lcmF0b3I+IGdlbmVyYXRvcihhZG9wdFB0cihuZXcgQnl0ZWNvZGVHZW5lcmF0b3IoYm9k eS5nZXQoKSwgZ2xvYmFsT2JqZWN0LT5kZWJ1Z2dlcigpLCBzY29wZUNoYWluLCBtX2NvZGVCbG9j a0ZvckNhbGwtPnN5bWJvbFRhYmxlKCksIG1fY29kZUJsb2NrRm9yQ2FsbC5nZXQoKSkpKTsKICAg ICBnZW5lcmF0b3ItPmdlbmVyYXRlKCk7CiAgICAgbV9udW1QYXJhbWV0ZXJzRm9yQ2FsbCA9IG1f Y29kZUJsb2NrRm9yQ2FsbC0+bV9udW1QYXJhbWV0ZXJzOwogICAgIEFTU0VSVChtX251bVBhcmFt ZXRlcnNGb3JDYWxsKTsKQEAgLTE3NCw3ICsyMDQsNyBAQCBKU09iamVjdCogRnVuY3Rpb25FeGVj dXRhYmxlOjpjb21waWxlRm9yCiAKICNpZiBFTkFCTEUoSklUKQogICAgIGlmIChleGVjLT5nbG9i YWxEYXRhKCkuY2FuVXNlSklUKCkpIHsKLSAgICAgICAgbV9qaXRDb2RlRm9yQ2FsbCA9IEpJVDo6 Y29tcGlsZShzY29wZUNoYWluTm9kZS0+Z2xvYmFsRGF0YSwgbV9jb2RlQmxvY2tGb3JDYWxsLCAm bV9qaXRDb2RlRm9yQ2FsbFdpdGhBcml0eUNoZWNrKTsKKyAgICAgICAgbV9qaXRDb2RlRm9yQ2Fs bCA9IEpJVDo6Y29tcGlsZShzY29wZUNoYWluTm9kZS0+Z2xvYmFsRGF0YSwgbV9jb2RlQmxvY2tG b3JDYWxsLmdldCgpLCAmbV9qaXRDb2RlRm9yQ2FsbFdpdGhBcml0eUNoZWNrKTsKICNpZiAhRU5B QkxFKE9QQ09ERV9TQU1QTElORykKICAgICAgICAgaWYgKCFCeXRlY29kZUdlbmVyYXRvcjo6ZHVt cHNHZW5lcmF0ZWRDb2RlKCkpCiAgICAgICAgICAgICBtX2NvZGVCbG9ja0ZvckNhbGwtPmRpc2Nh cmRCeXRlY29kZSgpOwpAQCAtMjAzLDggKzIzMyw4IEBAIEpTT2JqZWN0KiBGdW5jdGlvbkV4ZWN1 dGFibGU6OmNvbXBpbGVGb3IKICAgICBKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0ID0gc2Nv cGVDaGFpbi5nbG9iYWxPYmplY3QoKTsKIAogICAgIEFTU0VSVCghbV9jb2RlQmxvY2tGb3JDb25z dHJ1Y3QpOwotICAgIG1fY29kZUJsb2NrRm9yQ29uc3RydWN0ID0gbmV3IEZ1bmN0aW9uQ29kZUJs b2NrKHRoaXMsIEZ1bmN0aW9uQ29kZSwgc291cmNlKCkucHJvdmlkZXIoKSwgc291cmNlKCkuc3Rh cnRPZmZzZXQoKSwgdHJ1ZSk7Ci0gICAgT3duUHRyPEJ5dGVjb2RlR2VuZXJhdG9yPiBnZW5lcmF0 b3IoYWRvcHRQdHIobmV3IEJ5dGVjb2RlR2VuZXJhdG9yKGJvZHkuZ2V0KCksIGdsb2JhbE9iamVj dC0+ZGVidWdnZXIoKSwgc2NvcGVDaGFpbiwgbV9jb2RlQmxvY2tGb3JDb25zdHJ1Y3QtPnN5bWJv bFRhYmxlKCksIG1fY29kZUJsb2NrRm9yQ29uc3RydWN0KSkpOworICAgIG1fY29kZUJsb2NrRm9y Q29uc3RydWN0ID0gYWRvcHRQdHIobmV3IEZ1bmN0aW9uQ29kZUJsb2NrKHRoaXMsIEZ1bmN0aW9u Q29kZSwgc291cmNlKCkucHJvdmlkZXIoKSwgc291cmNlKCkuc3RhcnRPZmZzZXQoKSwgdHJ1ZSkp OworICAgIE93blB0cjxCeXRlY29kZUdlbmVyYXRvcj4gZ2VuZXJhdG9yKGFkb3B0UHRyKG5ldyBC eXRlY29kZUdlbmVyYXRvcihib2R5LmdldCgpLCBnbG9iYWxPYmplY3QtPmRlYnVnZ2VyKCksIHNj b3BlQ2hhaW4sIG1fY29kZUJsb2NrRm9yQ29uc3RydWN0LT5zeW1ib2xUYWJsZSgpLCBtX2NvZGVC bG9ja0ZvckNvbnN0cnVjdC5nZXQoKSkpKTsKICAgICBnZW5lcmF0b3ItPmdlbmVyYXRlKCk7CiAg ICAgbV9udW1QYXJhbWV0ZXJzRm9yQ29uc3RydWN0ID0gbV9jb2RlQmxvY2tGb3JDb25zdHJ1Y3Qt Pm1fbnVtUGFyYW1ldGVyczsKICAgICBBU1NFUlQobV9udW1QYXJhbWV0ZXJzRm9yQ29uc3RydWN0 KTsKQEAgLTIxNSw3ICsyNDUsNyBAQCBKU09iamVjdCogRnVuY3Rpb25FeGVjdXRhYmxlOjpjb21w aWxlRm9yCiAKICNpZiBFTkFCTEUoSklUKQogICAgIGlmIChleGVjLT5nbG9iYWxEYXRhKCkuY2Fu VXNlSklUKCkpIHsKLSAgICAgICAgbV9qaXRDb2RlRm9yQ29uc3RydWN0ID0gSklUOjpjb21waWxl KHNjb3BlQ2hhaW5Ob2RlLT5nbG9iYWxEYXRhLCBtX2NvZGVCbG9ja0ZvckNvbnN0cnVjdCwgJm1f aml0Q29kZUZvckNvbnN0cnVjdFdpdGhBcml0eUNoZWNrKTsKKyAgICAgICAgbV9qaXRDb2RlRm9y Q29uc3RydWN0ID0gSklUOjpjb21waWxlKHNjb3BlQ2hhaW5Ob2RlLT5nbG9iYWxEYXRhLCBtX2Nv ZGVCbG9ja0ZvckNvbnN0cnVjdC5nZXQoKSwgJm1faml0Q29kZUZvckNvbnN0cnVjdFdpdGhBcml0 eUNoZWNrKTsKICNpZiAhRU5BQkxFKE9QQ09ERV9TQU1QTElORykKICAgICAgICAgaWYgKCFCeXRl Y29kZUdlbmVyYXRvcjo6ZHVtcHNHZW5lcmF0ZWRDb2RlKCkpCiAgICAgICAgICAgICBtX2NvZGVC bG9ja0ZvckNvbnN0cnVjdC0+ZGlzY2FyZEJ5dGVjb2RlKCk7CkBAIC0yOTgsMTAgKzMyOCw4IEBA IFBhc3NPd25QdHI8RXhjZXB0aW9uSW5mbz4gRXZhbEV4ZWN1dGFibGUKIAogdm9pZCBGdW5jdGlv bkV4ZWN1dGFibGU6OnJlY29tcGlsZShFeGVjU3RhdGUqKQogewotICAgIGRlbGV0ZSBtX2NvZGVC bG9ja0ZvckNhbGw7Ci0gICAgbV9jb2RlQmxvY2tGb3JDYWxsID0gMDsKLSAgICBkZWxldGUgbV9j b2RlQmxvY2tGb3JDb25zdHJ1Y3Q7Ci0gICAgbV9jb2RlQmxvY2tGb3JDb25zdHJ1Y3QgPSAwOwor ICAgIG1fY29kZUJsb2NrRm9yQ2FsbC5jbGVhcigpOworICAgIG1fY29kZUJsb2NrRm9yQ29uc3Ry dWN0LmNsZWFyKCk7CiAgICAgbV9udW1QYXJhbWV0ZXJzRm9yQ2FsbCA9IE5VTV9QQVJBTUVURVJT X05PVF9DT01QSUxFRDsKICAgICBtX251bVBhcmFtZXRlcnNGb3JDb25zdHJ1Y3QgPSBOVU1fUEFS QU1FVEVSU19OT1RfQ09NUElMRUQ7CiAjaWYgRU5BQkxFKEpJVCkKSW5kZXg6IEphdmFTY3JpcHRD b3JlL3J1bnRpbWUvRXhlY3V0YWJsZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEphdmFTY3JpcHRDb3JlL3J1 bnRpbWUvRXhlY3V0YWJsZS5oCShyZXZpc2lvbiA2MzU5OSkKKysrIEphdmFTY3JpcHRDb3JlL3J1 bnRpbWUvRXhlY3V0YWJsZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0yMjAsMTcgKzIyMCwxMyBAQCBu YW1lc3BhY2UgSlNDIHsKICNlbmRpZgogCiAgICAgcHJpdmF0ZToKLSAgICAgICAgRXZhbEV4ZWN1 dGFibGUoRXhlY1N0YXRlKiBleGVjLCBjb25zdCBTb3VyY2VDb2RlJiBzb3VyY2UpCi0gICAgICAg ICAgICA6IFNjcmlwdEV4ZWN1dGFibGUoZXhlYywgc291cmNlKQotICAgICAgICAgICAgLCBtX2V2 YWxDb2RlQmxvY2soMCkKLSAgICAgICAgewotICAgICAgICB9CisgICAgICAgIEV2YWxFeGVjdXRh YmxlKEV4ZWNTdGF0ZSosIGNvbnN0IFNvdXJjZUNvZGUmKTsKIAogICAgICAgICBKU09iamVjdCog Y29tcGlsZUludGVybmFsKEV4ZWNTdGF0ZSosIFNjb3BlQ2hhaW5Ob2RlKik7CiAKICAgICAgICAg dmlydHVhbCBQYXNzT3duUHRyPEV4Y2VwdGlvbkluZm8+IHJlcGFyc2VFeGNlcHRpb25JbmZvKEpT R2xvYmFsRGF0YSosIFNjb3BlQ2hhaW5Ob2RlKiwgQ29kZUJsb2NrKik7CiAKLSAgICAgICAgRXZh bENvZGVCbG9jayogbV9ldmFsQ29kZUJsb2NrOworICAgICAgICBPd25QdHI8RXZhbENvZGVCbG9j az4gbV9ldmFsQ29kZUJsb2NrOwogICAgIH07CiAKICAgICBjbGFzcyBQcm9ncmFtRXhlY3V0YWJs ZSA6IHB1YmxpYyBTY3JpcHRFeGVjdXRhYmxlIHsKQEAgLTI2NywxNyArMjYzLDEzIEBAIG5hbWVz cGFjZSBKU0MgewogI2VuZGlmCiAKICAgICBwcml2YXRlOgotICAgICAgICBQcm9ncmFtRXhlY3V0 YWJsZShFeGVjU3RhdGUqIGV4ZWMsIGNvbnN0IFNvdXJjZUNvZGUmIHNvdXJjZSkKLSAgICAgICAg ICAgIDogU2NyaXB0RXhlY3V0YWJsZShleGVjLCBzb3VyY2UpCi0gICAgICAgICAgICAsIG1fcHJv Z3JhbUNvZGVCbG9jaygwKQotICAgICAgICB7Ci0gICAgICAgIH0KKyAgICAgICAgUHJvZ3JhbUV4 ZWN1dGFibGUoRXhlY1N0YXRlKiwgY29uc3QgU291cmNlQ29kZSYpOwogCiAgICAgICAgIEpTT2Jq ZWN0KiBjb21waWxlSW50ZXJuYWwoRXhlY1N0YXRlKiwgU2NvcGVDaGFpbk5vZGUqKTsKIAogICAg ICAgICB2aXJ0dWFsIFBhc3NPd25QdHI8RXhjZXB0aW9uSW5mbz4gcmVwYXJzZUV4Y2VwdGlvbklu Zm8oSlNHbG9iYWxEYXRhKiwgU2NvcGVDaGFpbk5vZGUqLCBDb2RlQmxvY2sqKTsKIAotICAgICAg ICBQcm9ncmFtQ29kZUJsb2NrKiBtX3Byb2dyYW1Db2RlQmxvY2s7CisgICAgICAgIE93blB0cjxQ cm9ncmFtQ29kZUJsb2NrPiBtX3Byb2dyYW1Db2RlQmxvY2s7CiAgICAgfTsKIAogICAgIGNsYXNz IEZ1bmN0aW9uRXhlY3V0YWJsZSA6IHB1YmxpYyBTY3JpcHRFeGVjdXRhYmxlIHsKQEAgLTM1OCwz NyArMzUwLDEyIEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICBTaGFyZWRTeW1ib2xUYWJsZSog c3ltYm9sVGFibGUoKSBjb25zdCB7IHJldHVybiBtX3N5bWJvbFRhYmxlOyB9CiAKICAgICAgICAg dm9pZCByZWNvbXBpbGUoRXhlY1N0YXRlKik7Ci0gICAgICAgIHZvaWQgbWFya0FnZ3JlZ2F0ZShN YXJrU3RhY2smIG1hcmtTdGFjayk7CisgICAgICAgIHZvaWQgbWFya0FnZ3JlZ2F0ZShNYXJrU3Rh Y2smKTsKICAgICAgICAgc3RhdGljIFBhc3NSZWZQdHI8RnVuY3Rpb25FeGVjdXRhYmxlPiBmcm9t R2xvYmFsQ29kZShjb25zdCBJZGVudGlmaWVyJiwgRXhlY1N0YXRlKiwgRGVidWdnZXIqLCBjb25z dCBTb3VyY2VDb2RlJiwgSlNPYmplY3QqKiBleGNlcHRpb24pOwogCiAgICAgcHJpdmF0ZToKLSAg ICAgICAgRnVuY3Rpb25FeGVjdXRhYmxlKEpTR2xvYmFsRGF0YSogZ2xvYmFsRGF0YSwgY29uc3Qg SWRlbnRpZmllciYgbmFtZSwgY29uc3QgU291cmNlQ29kZSYgc291cmNlLCBib29sIGZvcmNlVXNl c0FyZ3VtZW50cywgRnVuY3Rpb25QYXJhbWV0ZXJzKiBwYXJhbWV0ZXJzLCBpbnQgZmlyc3RMaW5l LCBpbnQgbGFzdExpbmUpCi0gICAgICAgICAgICA6IFNjcmlwdEV4ZWN1dGFibGUoZ2xvYmFsRGF0 YSwgc291cmNlKQotICAgICAgICAgICAgLCBtX251bVZhcmlhYmxlcygwKQotICAgICAgICAgICAg LCBtX2ZvcmNlVXNlc0FyZ3VtZW50cyhmb3JjZVVzZXNBcmd1bWVudHMpCi0gICAgICAgICAgICAs IG1fcGFyYW1ldGVycyhwYXJhbWV0ZXJzKQotICAgICAgICAgICAgLCBtX2NvZGVCbG9ja0ZvckNh bGwoMCkKLSAgICAgICAgICAgICwgbV9jb2RlQmxvY2tGb3JDb25zdHJ1Y3QoMCkKLSAgICAgICAg ICAgICwgbV9uYW1lKG5hbWUpCi0gICAgICAgICAgICAsIG1fc3ltYm9sVGFibGUoMCkKLSAgICAg ICAgewotICAgICAgICAgICAgbV9maXJzdExpbmUgPSBmaXJzdExpbmU7Ci0gICAgICAgICAgICBt X2xhc3RMaW5lID0gbGFzdExpbmU7Ci0gICAgICAgIH0KLQotICAgICAgICBGdW5jdGlvbkV4ZWN1 dGFibGUoRXhlY1N0YXRlKiBleGVjLCBjb25zdCBJZGVudGlmaWVyJiBuYW1lLCBjb25zdCBTb3Vy Y2VDb2RlJiBzb3VyY2UsIGJvb2wgZm9yY2VVc2VzQXJndW1lbnRzLCBGdW5jdGlvblBhcmFtZXRl cnMqIHBhcmFtZXRlcnMsIGludCBmaXJzdExpbmUsIGludCBsYXN0TGluZSkKLSAgICAgICAgICAg IDogU2NyaXB0RXhlY3V0YWJsZShleGVjLCBzb3VyY2UpCi0gICAgICAgICAgICAsIG1fbnVtVmFy aWFibGVzKDApCi0gICAgICAgICAgICAsIG1fZm9yY2VVc2VzQXJndW1lbnRzKGZvcmNlVXNlc0Fy Z3VtZW50cykKLSAgICAgICAgICAgICwgbV9wYXJhbWV0ZXJzKHBhcmFtZXRlcnMpCi0gICAgICAg ICAgICAsIG1fY29kZUJsb2NrRm9yQ2FsbCgwKQotICAgICAgICAgICAgLCBtX2NvZGVCbG9ja0Zv ckNvbnN0cnVjdCgwKQotICAgICAgICAgICAgLCBtX25hbWUobmFtZSkKLSAgICAgICAgICAgICwg bV9zeW1ib2xUYWJsZSgwKQotICAgICAgICB7Ci0gICAgICAgICAgICBtX2ZpcnN0TGluZSA9IGZp cnN0TGluZTsKLSAgICAgICAgICAgIG1fbGFzdExpbmUgPSBsYXN0TGluZTsKLSAgICAgICAgfQor ICAgICAgICBGdW5jdGlvbkV4ZWN1dGFibGUoSlNHbG9iYWxEYXRhKiwgY29uc3QgSWRlbnRpZmll ciYgbmFtZSwgY29uc3QgU291cmNlQ29kZSYsIGJvb2wgZm9yY2VVc2VzQXJndW1lbnRzLCBGdW5j dGlvblBhcmFtZXRlcnMqLCBpbnQgZmlyc3RMaW5lLCBpbnQgbGFzdExpbmUpOworICAgICAgICBG dW5jdGlvbkV4ZWN1dGFibGUoRXhlY1N0YXRlKiwgY29uc3QgSWRlbnRpZmllciYgbmFtZSwgY29u c3QgU291cmNlQ29kZSYsIGJvb2wgZm9yY2VVc2VzQXJndW1lbnRzLCBGdW5jdGlvblBhcmFtZXRl cnMqLCBpbnQgZmlyc3RMaW5lLCBpbnQgbGFzdExpbmUpOwogCiAgICAgICAgIEpTT2JqZWN0KiBj b21waWxlRm9yQ2FsbEludGVybmFsKEV4ZWNTdGF0ZSosIFNjb3BlQ2hhaW5Ob2RlKik7CiAgICAg ICAgIEpTT2JqZWN0KiBjb21waWxlRm9yQ29uc3RydWN0SW50ZXJuYWwoRXhlY1N0YXRlKiwgU2Nv cGVDaGFpbk5vZGUqKTsKQEAgLTM5OSw4ICszNjYsOCBAQCBuYW1lc3BhY2UgSlNDIHsKICAgICAg ICAgYm9vbCBtX2ZvcmNlVXNlc0FyZ3VtZW50cyA6IDE7CiAKICAgICAgICAgUmVmUHRyPEZ1bmN0 aW9uUGFyYW1ldGVycz4gbV9wYXJhbWV0ZXJzOwotICAgICAgICBGdW5jdGlvbkNvZGVCbG9jayog bV9jb2RlQmxvY2tGb3JDYWxsOwotICAgICAgICBGdW5jdGlvbkNvZGVCbG9jayogbV9jb2RlQmxv Y2tGb3JDb25zdHJ1Y3Q7CisgICAgICAgIE93blB0cjxGdW5jdGlvbkNvZGVCbG9jaz4gbV9jb2Rl QmxvY2tGb3JDYWxsOworICAgICAgICBPd25QdHI8RnVuY3Rpb25Db2RlQmxvY2s+IG1fY29kZUJs b2NrRm9yQ29uc3RydWN0OwogICAgICAgICBJZGVudGlmaWVyIG1fbmFtZTsKICAgICAgICAgU2hh cmVkU3ltYm9sVGFibGUqIG1fc3ltYm9sVGFibGU7CiAK