44096 2010-08-17 03:05:35 -0700 Geolocation clearWatch() needs to protect against invalid IDs 2010-08-18 08:41:23 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 steveblock webkit-unassigned commit-queue darin ddkilzer jorlow jschuh steveblock oldest_to_newest 265448 0 steveblock 2010-08-17 03:05:35 -0700 Geolocation uses HashMap to store watch requests, keyed off the watch ID. Key values of 0 or -1 must not be used with HashMap. Geolocation does not use these values internally, but we need to protect against them being passed to clearWatch() from JavaScript. This was first reported in https://bugs.webkit.org/show_bug.cgi?id=39879#c60 265457 1 64570 steveblock 2010-08-17 03:19:44 -0700 Created attachment 64570 Patch 265734 2 64570 jorlow 2010-08-17 13:36:12 -0700 Comment on attachment 64570 Patch r=me Why would this crash though? Maybe the problem should be fixed within HashMap (or whatever's causing it)? 265761 3 darin 2010-08-17 14:09:58 -0700 (In reply to comment #2) > Maybe the problem should be fixed within HashMap (or whatever's causing it)? Changing HashMap itself directly is probably out of the question. HashMap achieves its speed in part by reserving values. We could use a hash table with a different design, but we’ve repeatedly reaffirmed our desire to use this. Putting the fix closer to the use of the HashMap object would make sense for some call sites like these. We could add some new functions to HashMap called safeFind and safeGet that would work more slowly and check for the empty and deleted values, for uses in sites like these where we need the reliable but slower behavior. That might be a cleaner fix than the higher level validity checks. 265819 4 64570 commit-queue 2010-08-17 16:06:07 -0700 Comment on attachment 64570 Patch Clearing flags on attachment: 64570 Committed r65570: <http://trac.webkit.org/changeset/65570> 265820 5 commit-queue 2010-08-17 16:06:12 -0700 All reviewed patches have been landed. Closing bug. 64570 2010-08-17 03:19:44 -0700 2010-08-17 16:06:07 -0700 Patch bug-44096-20100817111942.patch text/plain 6742 steveblock SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2NTQ5MCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjAgQEAKKzIwMTAtMDgtMTcgIFN0ZXZlIEJsb2NrICA8c3RldmVibG9ja0Bnb29n bGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEdlb2xvY2F0aW9uIGNsZWFyV2F0Y2goKSBuZWVkcyB0byBwcm90ZWN0IGFnYWluc3QgaW52YWxp ZCBJRHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ0 MDk2CisKKyAgICAgICAgSWYgdGhlIElEIHBhc3NlZCB0byBjbGVhcldhdGNoKCkgaXMgaW52YWxp ZCwgd2UgZWFybHktb3V0LgorCisgICAgICAgIFRlc3Q6IGZhc3QvZG9tL0dlb2xvY2F0aW9uL2Ns ZWFyLXdhdGNoLWludmFsaWQtaWQtY3Jhc2guaHRtbAorCisgICAgICAgICogcGFnZS9HZW9sb2Nh dGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHZW9sb2NhdGlvbjo6V2F0Y2hlcnM6OnNldCk6 CisgICAgICAgIChXZWJDb3JlOjpHZW9sb2NhdGlvbjo6V2F0Y2hlcnM6OnJlbW92ZSk6CisgICAg ICAgIChXZWJDb3JlOjpHZW9sb2NhdGlvbjo6d2F0Y2hQb3NpdGlvbik6CisgICAgICAgIChXZWJD b3JlOjpHZW9sb2NhdGlvbjo6Y2xlYXJXYXRjaCk6CisKIDIwMTAtMDgtMTcgIEFyaXlhIEhpZGF5 YXQgIDxhcml5YUBzZW5jaGEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEtlbm5ldGggUm9o ZGUgQ2hyaXN0aWFuc2VuLgpJbmRleDogV2ViQ29yZS9wYWdlL0dlb2xvY2F0aW9uLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJDb3JlL3BhZ2UvR2VvbG9jYXRpb24uY3BwCShyZXZpc2lvbiA2NTQzMSkK KysrIFdlYkNvcmUvcGFnZS9HZW9sb2NhdGlvbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ5LDYg KzQ5LDggQEAgc3RhdGljIGNvbnN0IGNoYXIgcGVybWlzc2lvbkRlbmllZEVycm9yTQogc3RhdGlj IGNvbnN0IGNoYXIgZmFpbGVkVG9TdGFydFNlcnZpY2VFcnJvck1lc3NhZ2VbXSA9ICJGYWlsZWQg dG8gc3RhcnQgR2VvbG9jYXRpb24gc2VydmljZSI7CiBzdGF0aWMgY29uc3QgY2hhciBmcmFtZWxl c3NEb2N1bWVudEVycm9yTWVzc2FnZVtdID0gIkdlb2xvY2F0aW9uIGNhbm5vdCBiZSB1c2VkIGlu IGZyYW1lbGVzcyBkb2N1bWVudHMiOwogCitzdGF0aWMgY29uc3QgaW50IGZpcnN0QXZhaWxhYmxl V2F0Y2hJZCA9IDE7CisKICNpZiBFTkFCTEUoQ0xJRU5UX0JBU0VEX0dFT0xPQ0FUSU9OKQogCiBz dGF0aWMgUGFzc1JlZlB0cjxHZW9wb3NpdGlvbj4gY3JlYXRlR2VvcG9zaXRpb24oR2VvbG9jYXRp b25Qb3NpdGlvbiogcG9zaXRpb24pCkBAIC0xNjQsNiArMTY2LDcgQEAgdm9pZCBHZW9sb2NhdGlv bjo6R2VvTm90aWZpZXI6OnRpbWVyRmlyZQogCiB2b2lkIEdlb2xvY2F0aW9uOjpXYXRjaGVyczo6 c2V0KGludCBpZCwgUGFzc1JlZlB0cjxHZW9Ob3RpZmllcj4gcHJwTm90aWZpZXIpCiB7CisgICAg QVNTRVJUKGlkID4gMCk7CiAgICAgUmVmUHRyPEdlb05vdGlmaWVyPiBub3RpZmllciA9IHBycE5v dGlmaWVyOwogCiAgICAgbV9pZFRvTm90aWZpZXJNYXAuc2V0KGlkLCBub3RpZmllci5nZXQoKSk7 CkBAIC0xNzIsNiArMTc1LDcgQEAgdm9pZCBHZW9sb2NhdGlvbjo6V2F0Y2hlcnM6OnNldChpbnQg aWQsIAogCiB2b2lkIEdlb2xvY2F0aW9uOjpXYXRjaGVyczo6cmVtb3ZlKGludCBpZCkKIHsKKyAg ICBBU1NFUlQoaWQgPiAwKTsKICAgICBJZFRvTm90aWZpZXJNYXA6Oml0ZXJhdG9yIGl0ZXIgPSBt X2lkVG9Ob3RpZmllck1hcC5maW5kKGlkKTsKICAgICBpZiAoaXRlciA9PSBtX2lkVG9Ob3RpZmll ck1hcC5lbmQoKSkKICAgICAgICAgcmV0dXJuOwpAQCAtMjc1LDcgKzI3OSw3IEBAIGludCBHZW9s b2NhdGlvbjo6d2F0Y2hQb3NpdGlvbihQYXNzUmVmUHQKICAgICBSZWZQdHI8R2VvTm90aWZpZXI+ IG5vdGlmaWVyID0gc3RhcnRSZXF1ZXN0KHN1Y2Nlc3NDYWxsYmFjaywgZXJyb3JDYWxsYmFjaywg b3B0aW9ucyk7CiAgICAgQVNTRVJUKG5vdGlmaWVyKTsKIAotICAgIHN0YXRpYyBpbnQgbmV4dEF2 YWlsYWJsZVdhdGNoSWQgPSAxOworICAgIHN0YXRpYyBpbnQgbmV4dEF2YWlsYWJsZVdhdGNoSWQg PSBmaXJzdEF2YWlsYWJsZVdhdGNoSWQ7CiAgICAgLy8gSW4gY2FzZSBvZiBvdmVyZmxvdywgbWFr ZSBzdXJlIHRoZSBJRCByZW1haW5zIHBvc2l0aXZlLCBidXQgcmV1c2UgdGhlIElEIHZhbHVlcy4K ICAgICBpZiAobmV4dEF2YWlsYWJsZVdhdGNoSWQgPCAxKQogICAgICAgICBuZXh0QXZhaWxhYmxl V2F0Y2hJZCA9IDE7CkBAIC0zODcsNiArMzkxLDkgQEAgYm9vbCBHZW9sb2NhdGlvbjo6aGF2ZVN1 aXRhYmxlQ2FjaGVkUG9zaQogCiB2b2lkIEdlb2xvY2F0aW9uOjpjbGVhcldhdGNoKGludCB3YXRj aElkKQogeworICAgIGlmICh3YXRjaElkIDwgZmlyc3RBdmFpbGFibGVXYXRjaElkKQorICAgICAg ICByZXR1cm47CisKICAgICBtX3dhdGNoZXJzLnJlbW92ZSh3YXRjaElkKTsKICAgICAKICAgICBp ZiAoIWhhc0xpc3RlbmVycygpKQpJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gNjU0OTApCisrKyBMYXlvdXRU ZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNiBAQAorMjAxMC0wOC0x NyAgU3RldmUgQmxvY2sgIDxzdGV2ZWJsb2NrQGdvb2dsZS5jb20+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgR2VvbG9jYXRpb24gY2xlYXJXYXRjaCgp IG5lZWRzIHRvIHByb3RlY3QgYWdhaW5zdCBpbnZhbGlkIElEcworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDQwOTYKKworICAgICAgICAqIGZhc3QvZG9t L0dlb2xvY2F0aW9uL2NsZWFyLXdhdGNoLWludmFsaWQtaWQtY3Jhc2gtZXhwZWN0ZWQudHh0OiBB ZGRlZC4KKyAgICAgICAgKiBmYXN0L2RvbS9HZW9sb2NhdGlvbi9jbGVhci13YXRjaC1pbnZhbGlk LWlkLWNyYXNoLmh0bWw6IEFkZGVkLgorICAgICAgICAqIGZhc3QvZG9tL0dlb2xvY2F0aW9uL3Nj cmlwdC10ZXN0cy9jbGVhci13YXRjaC1pbnZhbGlkLWlkLWNyYXNoLmpzOiBBZGRlZC4KKyAgICAg ICAgKiBmYXN0L2RvbS9HZW9sb2NhdGlvbi9zY3JpcHQtdGVzdHMvbm90aW1lci1hZnRlci11bmxv YWQuanM6CisgICAgICAgIChkb2N1bWVudC5ib2R5Lm9ubG9hZCk6CisKIDIwMTAtMDgtMTcgIFl1 cnkgU2VtaWtoYXRza3kgIDx5dXJ5c0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgUGF2ZWwgRmVsZG1hbi4KSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvZG9tL0dlb2xvY2F0aW9u L2NsZWFyLXdhdGNoLWludmFsaWQtaWQtY3Jhc2gtZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IExheW91dFRlc3RzL2Zhc3QvZG9tL0dlb2xvY2F0aW9uL2NsZWFyLXdhdGNoLWludmFsaWQtaWQt Y3Jhc2gtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvZmFzdC9kb20v R2VvbG9jYXRpb24vY2xlYXItd2F0Y2gtaW52YWxpZC1pZC1jcmFzaC1leHBlY3RlZC50eHQJKHJl dmlzaW9uIDApCkBAIC0wLDAgKzEgQEAKK1RFU1QgQ09NUExFVEUKSW5kZXg6IExheW91dFRlc3Rz L2Zhc3QvZG9tL0dlb2xvY2F0aW9uL2NsZWFyLXdhdGNoLWludmFsaWQtaWQtY3Jhc2guaHRtbAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L2RvbS9HZW9sb2NhdGlvbi9jbGVhci13YXRj aC1pbnZhbGlkLWlkLWNyYXNoLmh0bWwJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9mYXN0 L2RvbS9HZW9sb2NhdGlvbi9jbGVhci13YXRjaC1pbnZhbGlkLWlkLWNyYXNoLmh0bWwJKHJldmlz aW9uIDApCkBAIC0wLDAgKzEsMTMgQEAKKzwhRE9DVFlQRSBIVE1MIFBVQkxJQyAiLS8vSUVURi8v RFREIEhUTUwvL0VOIj4KKzxodG1sPgorPGhlYWQ+Cis8bGluayByZWw9InN0eWxlc2hlZXQiIGhy ZWY9Ii4uLy4uL2pzL3Jlc291cmNlcy9qcy10ZXN0LXN0eWxlLmNzcyI+Cis8c2NyaXB0IHNyYz0i Li4vLi4vanMvcmVzb3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KKzwvaGVhZD4KKzxi b2R5PgorPHAgaWQ9ImRlc2NyaXB0aW9uIj48L3A+Cis8ZGl2IGlkPSJjb25zb2xlIj48L2Rpdj4K KzxzY3JpcHQgc3JjPSJzY3JpcHQtdGVzdHMvY2xlYXItd2F0Y2gtaW52YWxpZC1pZC1jcmFzaC5q cyI+PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iLi4vLi4vanMvcmVzb3VyY2VzL2pzLXRlc3QtcG9z dC5qcyI+PC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+CkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0 L2RvbS9HZW9sb2NhdGlvbi9zY3JpcHQtdGVzdHMvY2xlYXItd2F0Y2gtaW52YWxpZC1pZC1jcmFz aC5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L2RvbS9HZW9sb2NhdGlvbi9zY3Jp cHQtdGVzdHMvY2xlYXItd2F0Y2gtaW52YWxpZC1pZC1jcmFzaC5qcwkocmV2aXNpb24gMCkKKysr IExheW91dFRlc3RzL2Zhc3QvZG9tL0dlb2xvY2F0aW9uL3NjcmlwdC10ZXN0cy9jbGVhci13YXRj aC1pbnZhbGlkLWlkLWNyYXNoLmpzCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDE0IEBACitkZXNj cmlwdGlvbigiVGVzdHMgZm9yIGEgY3Jhc2ggd2hlbiBjbGVhcldhdGNoKCkgaXMgY2FsbGVkIHdp dGggYSB6ZXJvIElELjxicj48YnI+V2UgY2FsbCBjbGVhcldhdGNoKCkgd2l0aCBhIHJlcXVlc3Qg aW4gcHJvZ3Jlc3MgdGhlbiBuYXZpZ2F0ZSB0aGUgcGFnZS4gVGhpcyBhY2Nlc3NlcyB0aGUgd2F0 Y2hlcnMgbWFwIGR1cmluZyBjbGVhbnVwIGFuZCB0cmlnZ2VycyB0aGUgY3Jhc2guIFRoaXMgcGFn ZSBzaG91bGQgbm90IGJlIHZpc2libGUgd2hlbiB0aGUgdGVzdCBjb21wbGV0ZXMuIik7CisKK2lm ICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpIHsKKyAgICBsYXlvdXRUZXN0Q29udHJvbGxl ci5zZXRHZW9sb2NhdGlvblBlcm1pc3Npb24odHJ1ZSk7CisgICAgbGF5b3V0VGVzdENvbnRyb2xs ZXIuc2V0TW9ja0dlb2xvY2F0aW9uUG9zaXRpb24oNTEuNDc4LCAtMC4xNjYsIDEwMCk7Cit9IGVs c2UKKyAgICBkZWJ1ZygnVGhpcyB0ZXN0IGNhbiBub3QgYmUgcnVuIHdpdGhvdXQgdGhlIExheW91 dFRlc3RDb250cm9sbGVyJyk7CisKK25hdmlnYXRvci5nZW9sb2NhdGlvbi53YXRjaFBvc2l0aW9u KGZ1bmN0aW9uKCkge30pOworbmF2aWdhdG9yLmdlb2xvY2F0aW9uLmNsZWFyV2F0Y2goMCk7Cits b2NhdGlvbiA9ICJkYXRhOnRleHQvaHRtbCxURVNUIENPTVBMRVRFPHNjcmlwdD5sYXlvdXRUZXN0 Q29udHJvbGxlci5ub3RpZnlEb25lKCk7PC9zY3JpcHQ+IjsKKword2luZG93LmpzVGVzdElzQXN5 bmMgPSB0cnVlOword2luZG93LnN1Y2Nlc3NmdWxseVBhcnNlZCA9IHRydWU7CkluZGV4OiBMYXlv dXRUZXN0cy9mYXN0L2RvbS9HZW9sb2NhdGlvbi9zY3JpcHQtdGVzdHMvbm90aW1lci1hZnRlci11 bmxvYWQuanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9kb20vR2VvbG9jYXRpb24v c2NyaXB0LXRlc3RzL25vdGltZXItYWZ0ZXItdW5sb2FkLmpzCShyZXZpc2lvbiA2NTQzMSkKKysr IExheW91dFRlc3RzL2Zhc3QvZG9tL0dlb2xvY2F0aW9uL3NjcmlwdC10ZXN0cy9ub3RpbWVyLWFm dGVyLXVubG9hZC5qcwkod29ya2luZyBjb3B5KQpAQCAtMyw3ICszLDcgQEAgZGVzY3JpcHRpb24o IlRlc3RzIHRoYXQgbm8gdGltZXJzIHdpbGwgdAogaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJv bGxlcikgbGF5b3V0VGVzdENvbnRyb2xsZXIuc2V0R2VvbG9jYXRpb25QZXJtaXNzaW9uKHRydWUp OwogCiBkb2N1bWVudC5ib2R5Lm9ubG9hZCA9IGZ1bmN0aW9uKCkgewotICAgIGxvY2F0aW9uID0g ImRhdGE6dGV4dC9odG1sLFlvdSBzaG91bGQgaGF2ZSBzZWVuIG9uZSB1bmxvYWQgYWxlcnQgYXBw ZWFyLjxzY3JpcHQ+d2luZG93LnNldFRpbWVvdXQoJ2lmICh3aW5kb3cubGF5b3V0VGVzdENvbnRy b2xsZXIpIGxheW91dFRlc3RDb250cm9sbGVyLm5vdGlmeURvbmUoKTsnLCAxMDApOzwvIiArICJz Y3JpcHQ+IjsKKyAgICBsb2NhdGlvbiA9ICJkYXRhOnRleHQvaHRtbCxZb3Ugc2hvdWxkIGhhdmUg c2VlbiBvbmUgdW5sb2FkIGFsZXJ0IGFwcGVhci48c2NyaXB0PndpbmRvdy5zZXRUaW1lb3V0KCdp ZiAod2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKSBsYXlvdXRUZXN0Q29udHJvbGxlci5ub3Rp ZnlEb25lKCk7JywgMTAwKTs8L3NjcmlwdD4iOwogfQogCiBkb2N1bWVudC5ib2R5Lm9udW5sb2Fk ID0gZnVuY3Rpb24oKSB7Cg==