139299 2014-12-05 07:52:55 -0800 In NetworkResourceLoader always bail out after abort() 2014-12-05 11:42:37 -0800 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 koivisto webkit-unassigned ap commit-queue oldest_to_newest 1052729 0 koivisto 2014-12-05 07:52:55 -0800 It may kill the object. 1052731 1 242631 koivisto 2014-12-05 08:46:42 -0800 Created attachment 242631 patch 1052789 2 242631 commit-queue 2014-12-05 11:42:33 -0800 Comment on attachment 242631 patch Clearing flags on attachment: 242631 Committed r176858: <http://trac.webkit.org/changeset/176858> 1052790 3 commit-queue 2014-12-05 11:42:37 -0800 All reviewed patches have been landed. Closing bug. 242631 2014-12-05 08:46:42 -0800 2014-12-05 11:42:33 -0800 patch abort-bail-3.patch text/plain 5863 koivisto SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3Njg0MSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDE0LTEyLTA1ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBJbiBOZXR3b3JrUmVzb3VyY2VM b2FkZXIgYWx3YXlzIGJhaWwgb3V0IGFmdGVyIGFib3J0KCkKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzOTI5OQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEludm9raW5nIGFib3J0KCkgbWF5IGtpbGwgdGhl IGN1cnJlbnQgb2JqZWN0LiBUYWtlIGNhcmUgdG8gYmFpbCBvdXQgYWZ0ZXIgaXQuCisKKyAgICAg ICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuY3BwOgorICAgICAgICAo V2ViS2l0OjpOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OmRpZFJlY2VpdmVSZXNwb25zZUFzeW5jKToK KyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Jlc291cmNlTG9hZGVyOjpkaWRSZWNlaXZlQnVmZmVy KToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Jlc291cmNlTG9hZGVyOjpkaWRGaW5pc2hMb2Fk aW5nKToKKworICAgICAgICAgICAgRWl0aGVyIG1ha2Ugc3VyZSBzZW5kQWJvcnRpbmdPbkZhaWx1 cmUoKSBpcyBjYWxsZWQgbGFzdCBpbiBjYWxsYmFja3Mgb3IgdGhlIHJlc3VsdHMgaXMgZXhwbGlj aXRseSB0ZXN0ZWQuCisKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Jlc291cmNlTG9hZGVyOjpi dWZmZXJpbmdUaW1lckZpcmVkKToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Jlc291cmNlTG9h ZGVyOjpzZW5kQnVmZmVyTWF5YmVBYm9ydGluZyk6CisKKyAgICAgICAgICAgIFJlbmFtZSBhbmQg cmV0dXJuIGEgYm9vbGVhbiB0byBpbmRpY2F0ZSBpZiBsb2FkIHNob3VsZCBjb250aW51ZS4KKwor ICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OnNlbmRCdWZmZXIpOiBEZWxl dGVkLgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5oOgor CiAyMDE0LTEyLTA1ICBFcmljIENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgogCiAg ICAgICAgIFtpT1NdIGFsbG93IGhvc3QgYXBwbGljYXRpb24gdG8gb3B0LW91dCBvZiBhbHRlcm5h dGUgZnVsbHNjcmVlbiBwdC4gMgpJbmRleDogU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3Mv TmV0d29ya1Jlc291cmNlTG9hZGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9O ZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuY3BwCShyZXZpc2lvbiAxNzY4NDAp CisrKyBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xOTcsMTIgKzE5NywxMCBAQCB2b2lkIE5ldHdvcmtSZXNv dXJjZUxvYWRlcjo6ZGlkUmVjZWl2ZVJlCiAKICAgICBpZiAoaXNTeW5jaHJvbm91cygpKQogICAg ICAgICBtX3N5bmNocm9ub3VzTG9hZERhdGEtPnJlc3BvbnNlID0gcmVzcG9uc2U7Ci0gICAgZWxz ZQotICAgICAgICBzZW5kQWJvcnRpbmdPbkZhaWx1cmUoTWVzc2FnZXM6OldlYlJlc291cmNlTG9h ZGVyOjpEaWRSZWNlaXZlUmVzcG9uc2UocmVzcG9uc2UsIG1fcGFyYW1ldGVycy5pc01haW5SZXNv dXJjZSkpOwotCi0gICAgLy8gbV9oYW5kbGUgd2lsbCBiZSBudWxsIGlmIHRoZSByZXF1ZXN0IGdv dCBhYm9ydGVkIGFib3ZlLgotICAgIGlmICghbV9oYW5kbGUpCi0gICAgICAgIHJldHVybjsKKyAg ICBlbHNlIHsKKyAgICAgICAgaWYgKCFzZW5kQWJvcnRpbmdPbkZhaWx1cmUoTWVzc2FnZXM6Oldl YlJlc291cmNlTG9hZGVyOjpEaWRSZWNlaXZlUmVzcG9uc2UocmVzcG9uc2UsIG1fcGFyYW1ldGVy cy5pc01haW5SZXNvdXJjZSkpKQorICAgICAgICAgICAgcmV0dXJuOworICAgIH0KIAogICAgIC8v IEZvciBtYWluIHJlc291cmNlcywgdGhlIHdlYiBwcm9jZXNzIGlzIHJlc3BvbnNpYmxlIGZvciBz ZW5kaW5nIGJhY2sgYSBOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OkNvbnRpbnVlRGlkUmVjZWl2ZVJl c3BvbnNlIG1lc3NhZ2UuCiAgICAgaWYgKG1fcGFyYW1ldGVycy5pc01haW5SZXNvdXJjZSkKQEAg LTIzMiw3ICsyMzAsNyBAQCB2b2lkIE5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6ZGlkUmVjZWl2ZUJ1 CiAgICAgICAgIHN0YXJ0QnVmZmVyaW5nVGltZXJJZk5lZWRlZCgpOwogICAgICAgICByZXR1cm47 CiAgICAgfQotICAgIHNlbmRCdWZmZXIoYnVmZmVyLmdldCgpLCBlbmNvZGVkRGF0YUxlbmd0aCk7 CisgICAgc2VuZEJ1ZmZlck1heWJlQWJvcnRpbmcoKmJ1ZmZlciwgZW5jb2RlZERhdGFMZW5ndGgp OwogfQogCiB2b2lkIE5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6ZGlkRmluaXNoTG9hZGluZyhSZXNv dXJjZUhhbmRsZSogaGFuZGxlLCBkb3VibGUgZmluaXNoVGltZSkKQEAgLTI0Miw4ICsyNDAsMTIg QEAgdm9pZCBOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OmRpZEZpbmlzaExvYQogICAgIGlmIChpc1N5 bmNocm9ub3VzKCkpCiAgICAgICAgIHNlbmRSZXBseVRvU3luY2hyb25vdXNSZXF1ZXN0KCptX3N5 bmNocm9ub3VzTG9hZERhdGEsIG1fYnVmZmVyZWREYXRhLmdldCgpKTsKICAgICBlbHNlIHsKLSAg ICAgICAgaWYgKG1fYnVmZmVyZWREYXRhICYmIG1fYnVmZmVyZWREYXRhLT5zaXplKCkpCi0gICAg ICAgICAgICBzZW5kQnVmZmVyKG1fYnVmZmVyZWREYXRhLmdldCgpLCAtMSk7CisgICAgICAgIGlm IChtX2J1ZmZlcmVkRGF0YSAmJiBtX2J1ZmZlcmVkRGF0YS0+c2l6ZSgpKSB7CisgICAgICAgICAg ICAvLyBGSVhNRTogUGFzcyBhIHJlYWwgdmFsdWUgb3IgcmVtb3ZlIHRoZSBlbmNvZGVkIGRhdGEg c2l6ZSBmZWF0dXJlLgorICAgICAgICAgICAgYm9vbCBzaG91bGRDb250aW51ZSA9IHNlbmRCdWZm ZXJNYXliZUFib3J0aW5nKCptX2J1ZmZlcmVkRGF0YSwgLTEpOworICAgICAgICAgICAgaWYgKCFz aG91bGRDb250aW51ZSkKKyAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KICAgICAg ICAgc2VuZChNZXNzYWdlczo6V2ViUmVzb3VyY2VMb2FkZXI6OkRpZEZpbmlzaFJlc291cmNlTG9h ZChmaW5pc2hUaW1lKSk7CiAgICAgfQogCkBAIC0zOTYsMzAgKzM5OCwzMCBAQCB2b2lkIE5ldHdv cmtSZXNvdXJjZUxvYWRlcjo6YnVmZmVyaW5nVGltCiAgICAgICAgIHJldHVybjsKIAogICAgIElQ Qzo6U2hhcmVkQnVmZmVyRGF0YVJlZmVyZW5jZSBkYXRhUmVmZXJlbmNlKG1fYnVmZmVyZWREYXRh LmdldCgpKTsKLSAgICBzZW5kQWJvcnRpbmdPbkZhaWx1cmUoTWVzc2FnZXM6OldlYlJlc291cmNl TG9hZGVyOjpEaWRSZWNlaXZlRGF0YShkYXRhUmVmZXJlbmNlLCBtX2J1ZmZlcmVkRGF0YUVuY29k ZWREYXRhTGVuZ3RoKSk7CisgICAgc2l6ZV90IGVuY29kZWRMZW5ndGggPSBtX2J1ZmZlcmVkRGF0 YUVuY29kZWREYXRhTGVuZ3RoOwogCiAgICAgbV9idWZmZXJlZERhdGEgPSBXZWJDb3JlOjpTaGFy ZWRCdWZmZXI6OmNyZWF0ZSgpOwogICAgIG1fYnVmZmVyZWREYXRhRW5jb2RlZERhdGFMZW5ndGgg PSAwOworCisgICAgc2VuZEFib3J0aW5nT25GYWlsdXJlKE1lc3NhZ2VzOjpXZWJSZXNvdXJjZUxv YWRlcjo6RGlkUmVjZWl2ZURhdGEoZGF0YVJlZmVyZW5jZSwgZW5jb2RlZExlbmd0aCkpOwogfQog Ci12b2lkIE5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6c2VuZEJ1ZmZlcihXZWJDb3JlOjpTaGFyZWRC dWZmZXIqIGJ1ZmZlciwgaW50IGVuY29kZWREYXRhTGVuZ3RoKQorYm9vbCBOZXR3b3JrUmVzb3Vy Y2VMb2FkZXI6OnNlbmRCdWZmZXJNYXliZUFib3J0aW5nKFdlYkNvcmU6OlNoYXJlZEJ1ZmZlciYg YnVmZmVyLCBzaXplX3QgZW5jb2RlZERhdGFMZW5ndGgpCiB7Ci0gICAgQVNTRVJUKGJ1ZmZlcik7 CiAgICAgQVNTRVJUKCFpc1N5bmNocm9ub3VzKCkpOwogCiAjaWYgUExBVEZPUk0oSU9TKSB8fCAo UExBVEZPUk0oTUFDKSAmJiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEwOTAp CiAgICAgU2hhcmVhYmxlUmVzb3VyY2U6OkhhbmRsZSBzaGFyZWFibGVSZXNvdXJjZUhhbmRsZTsK LSAgICBOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OnRyeUdldFNoYXJlYWJsZUhhbmRsZUZyb21TaGFy ZWRCdWZmZXIoc2hhcmVhYmxlUmVzb3VyY2VIYW5kbGUsICpidWZmZXIpOworICAgIE5ldHdvcmtS ZXNvdXJjZUxvYWRlcjo6dHJ5R2V0U2hhcmVhYmxlSGFuZGxlRnJvbVNoYXJlZEJ1ZmZlcihzaGFy ZWFibGVSZXNvdXJjZUhhbmRsZSwgYnVmZmVyKTsKICAgICBpZiAoIXNoYXJlYWJsZVJlc291cmNl SGFuZGxlLmlzTnVsbCgpKSB7Ci0gICAgICAgIC8vIFNpbmNlIHdlJ3JlIGRlbGl2ZXJpbmcgdGhp cyByZXNvdXJjZSBieSBvdXJzZWx2ZXMgYWxsIGF0IG9uY2UgYW5kIGRvbid0IG5lZWQgYW55IG1v cmUgZGF0YSBvciBjYWxsYmFja3MgZnJvbSB0aGUgbmV0d29yayBsYXllciwgYWJvcnQgdGhlIGxv YWRlci4KLSAgICAgICAgYWJvcnQoKTsKICAgICAgICAgc2VuZChNZXNzYWdlczo6V2ViUmVzb3Vy Y2VMb2FkZXI6OkRpZFJlY2VpdmVSZXNvdXJjZShzaGFyZWFibGVSZXNvdXJjZUhhbmRsZSwgY3Vy cmVudFRpbWUoKSkpOwotICAgICAgICByZXR1cm47CisgICAgICAgIGFib3J0KCk7CisgICAgICAg IHJldHVybiBmYWxzZTsKICAgICB9CiAjZW5kaWYKIAotICAgIElQQzo6U2hhcmVkQnVmZmVyRGF0 YVJlZmVyZW5jZSBkYXRhUmVmZXJlbmNlKGJ1ZmZlcik7Ci0gICAgc2VuZEFib3J0aW5nT25GYWls dXJlKE1lc3NhZ2VzOjpXZWJSZXNvdXJjZUxvYWRlcjo6RGlkUmVjZWl2ZURhdGEoZGF0YVJlZmVy ZW5jZSwgZW5jb2RlZERhdGFMZW5ndGgpKTsKKyAgICBJUEM6OlNoYXJlZEJ1ZmZlckRhdGFSZWZl cmVuY2UgZGF0YVJlZmVyZW5jZSgmYnVmZmVyKTsKKyAgICByZXR1cm4gc2VuZEFib3J0aW5nT25G YWlsdXJlKE1lc3NhZ2VzOjpXZWJSZXNvdXJjZUxvYWRlcjo6RGlkUmVjZWl2ZURhdGEoZGF0YVJl ZmVyZW5jZSwgZW5jb2RlZERhdGFMZW5ndGgpKTsKIH0KIAogSVBDOjpDb25uZWN0aW9uKiBOZXR3 b3JrUmVzb3VyY2VMb2FkZXI6Om1lc3NhZ2VTZW5kZXJDb25uZWN0aW9uKCkKSW5kZXg6IFNvdXJj ZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRl ci5oCShyZXZpc2lvbiAxNzY4NDApCisrKyBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9O ZXR3b3JrUmVzb3VyY2VMb2FkZXIuaAkod29ya2luZyBjb3B5KQpAQCAtMTUwLDcgKzE1MCw3IEBA IHByaXZhdGU6CiAKICAgICB2b2lkIHN0YXJ0QnVmZmVyaW5nVGltZXJJZk5lZWRlZCgpOwogICAg IHZvaWQgYnVmZmVyaW5nVGltZXJGaXJlZCgpOwotICAgIHZvaWQgc2VuZEJ1ZmZlcihXZWJDb3Jl OjpTaGFyZWRCdWZmZXIqLCBpbnQgZW5jb2RlZERhdGFMZW5ndGgpOworICAgIGJvb2wgc2VuZEJ1 ZmZlck1heWJlQWJvcnRpbmcoV2ViQ29yZTo6U2hhcmVkQnVmZmVyJiwgc2l6ZV90IGVuY29kZWRE YXRhTGVuZ3RoKTsKIAogICAgIGJvb2wgaXNTeW5jaHJvbm91cygpIGNvbnN0OwogCg==