24770 2009-03-23 19:33:26 -0700 Geolocation Coordinates do not return null when they should 2009-04-13 10:07:54 -0700 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED InRadar P2 Normal --- 1 bolsinga bolsinga sam oldest_to_newest 114903 0 bolsinga 2009-03-23 19:33:26 -0700 See: http://dev.w3.org/geo/api/spec-source.html#coordinates The current implementation returns 0 or -1. 114904 1 bolsinga 2009-03-23 19:33:52 -0700 <rdar://problem/6713745> 117280 2 29426 bolsinga 2009-04-12 19:45:20 -0700 Created attachment 29426 patch channeled by Sam This is from the beginnings of a patch from Sam. I've added it to support the 4 Coordinates properties that are null if they cannot be provided. 117303 3 29426 darin 2009-04-13 07:46:07 -0700 Comment on attachment 29426 patch channeled by Sam Seems to me that since these are doubles we could have used NaN instead of separate booleans to initialize the Coordinates object. r=me 117306 4 bolsinga 2009-04-13 10:07:54 -0700 bolsinga:WebKit bolsinga$ svn commit Sending WebCore/ChangeLog Sending WebCore/GNUmakefile.am Sending WebCore/WebCore.pro Sending WebCore/WebCore.scons Sending WebCore/WebCore.vcproj/WebCore.vcproj Sending WebCore/WebCore.xcodeproj/project.pbxproj Sending WebCore/WebCoreSources.bkl Adding WebCore/bindings/js/JSCoordinatesCustom.cpp Sending WebCore/page/Coordinates.h Sending WebCore/page/Coordinates.idl Sending WebCore/platform/mac/GeolocationServiceMac.mm Transmitting file data ........... Committed revision 42437. 29426 2009-04-12 19:45:20 -0700 2009-04-13 07:46:07 -0700 patch channeled by Sam 24770.patch.txt text/plain 13255 bolsinga SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0MjQzMCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzEgQEAKKzIwMDktMDQtMTIgIEdyZWcgQm9sc2luZ2EgIDxib2xzaW5nYUBhcHBs ZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI0NzcwCisgICAgICAgIAor ICAgICAgICBBZGQgY3VzdG9tIGNvZGUgZm9yIENvb3JkaW5hdGVzIHRoYXQgcmV0dXJucyBudWxs IHdoZW4gcmVxdWlyZWQgYnkgdGhlCisgICAgICAgIEdlb2xvY2F0aW9uIHNwZWMuCisgICAgICAg IAorICAgICAgICBodHRwOi8vZGV2LnczLm9yZy9nZW8vYXBpL3NwZWMtc291cmNlLmh0bWwjY29v cmRpbmF0ZXMKKworICAgICAgICAqIFdlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoK KyAgICAgICAgKiBiaW5kaW5ncy9qcy9KU0Nvb3JkaW5hdGVzQ3VzdG9tLmNwcDogQWRkZWQuCisg ICAgICAgIChXZWJDb3JlOjpKU0Nvb3JkaW5hdGVzOjphbHRpdHVkZSk6IHJldHVybnMgbnVsbCBp ZiB0aGUgdmFsdWUgY2Fubm90IGJlIHByb3ZpZGVkLgorICAgICAgICAoV2ViQ29yZTo6SlNDb29y ZGluYXRlczo6YWx0aXR1ZGVBY2N1cmFjeSk6IERpdHRvCisgICAgICAgIChXZWJDb3JlOjpKU0Nv b3JkaW5hdGVzOjpoZWFkaW5nKTogRGl0dG8KKyAgICAgICAgKFdlYkNvcmU6OkpTQ29vcmRpbmF0 ZXM6OnNwZWVkKTogRGl0dG8KKyAgICAgICAgKiBwYWdlL0Nvb3JkaW5hdGVzLmg6CisgICAgICAg IChXZWJDb3JlOjpDb29yZGluYXRlczo6Y3JlYXRlKTogQWRkICdjYW5Qcm92aWRlJyBwYXJhbWV0 ZXJzIGFuZCB2YWx1ZXMKKyAgICAgICAgKFdlYkNvcmU6OkNvb3JkaW5hdGVzOjpjYW5Qcm92aWRl QWx0aXR1ZGUpOgorICAgICAgICAoV2ViQ29yZTo6Q29vcmRpbmF0ZXM6OmNhblByb3ZpZGVBbHRp dHVkZUFjY3VyYWN5KToKKyAgICAgICAgKFdlYkNvcmU6OkNvb3JkaW5hdGVzOjpjYW5Qcm92aWRl SGVhZGluZyk6CisgICAgICAgIChXZWJDb3JlOjpDb29yZGluYXRlczo6Y2FuUHJvdmlkZVNwZWVk KToKKyAgICAgICAgKFdlYkNvcmU6OkNvb3JkaW5hdGVzOjpDb29yZGluYXRlcyk6CisgICAgICAg ICogcGFnZS9Db29yZGluYXRlcy5pZGw6IHNwZWNpZnkgY3VzdG9tIGdldHRlcnMKKyAgICAgICAg KiBwbGF0Zm9ybS9tYWMvR2VvbG9jYXRpb25TZXJ2aWNlTWFjLm1tOiBTZXQgdGhlIHZhbHVlcyBj b3JyZWN0bHkgaWYgdGhleSBjYW5ub3QgYmUgcHJvdmlkZWQuCisgICAgICAgICgtW1dlYkNvcmVD b3JlTG9jYXRpb25PYnNlcnZlciBsb2NhdGlvbk1hbmFnZXI6ZGlkVXBkYXRlVG9Mb2NhdGlvbjpm cm9tTG9jYXRpb246XSk6CisKIDIwMDktMDQtMTIgIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9y Zz4KIAogICAgICAgICBSZXZpZXdlZCBieSBNYXJrIFJvd2UuCkluZGV4OiBXZWJDb3JlL1dlYkNv cmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvago9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL1dlYkNv cmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagkocmV2aXNpb24gNDI0MzApCisrKyBXZWJDb3Jl L1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagkod29ya2luZyBjb3B5KQpAQCAtNDQ0 MSw2ICs0NDQxLDcgQEAKIAkJRkU2RkQ0ODkwRjY3NkU1NzAwMDkyODczIC8qIENvb3JkaW5hdGVz LmlkbCBpbiBSZXNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gRkU2 RkQ0ODYwRjY3NkU1NzAwMDkyODczIC8qIENvb3JkaW5hdGVzLmlkbCAqLzsgfTsKIAkJRkU2RkQ0 OEQwRjY3NkU5MzAwMDkyODczIC8qIEpTQ29vcmRpbmF0ZXMuY3BwIGluIFNvdXJjZXMgKi8gPSB7 aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gRkU2RkQ0OEIwRjY3NkU5MzAwMDkyODczIC8q IEpTQ29vcmRpbmF0ZXMuY3BwICovOyB9OwogCQlGRTZGRDQ4RTBGNjc2RTkzMDAwOTI4NzMgLyog SlNDb29yZGluYXRlcy5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxl UmVmID0gRkU2RkQ0OEMwRjY3NkU5MzAwMDkyODczIC8qIEpTQ29vcmRpbmF0ZXMuaCAqLzsgfTsK KwkJRkU3MDBERDEwRjkyRDgxQTAwOEUyQkZFIC8qIEpTQ29vcmRpbmF0ZXNDdXN0b20uY3BwIGlu IFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gRkU3MDBERDAwRjky RDgxQTAwOEUyQkZFIC8qIEpTQ29vcmRpbmF0ZXNDdXN0b20uY3BwICovOyB9OwogCQlGRTgwRDdB NzBFOUMxRUQyMDAwRDZGNzUgLyogSlNDdXN0b21Qb3NpdGlvbkNhbGxiYWNrLmNwcCBpbiBTb3Vy Y2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEZFODBEN0EyMEU5QzFFRDIw MDBENkY3NSAvKiBKU0N1c3RvbVBvc2l0aW9uQ2FsbGJhY2suY3BwICovOyB9OwogCQlGRTgwRDdB ODBFOUMxRUQyMDAwRDZGNzUgLyogSlNDdXN0b21Qb3NpdGlvbkNhbGxiYWNrLmggaW4gSGVhZGVy cyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBGRTgwRDdBMzBFOUMxRUQyMDAw RDZGNzUgLyogSlNDdXN0b21Qb3NpdGlvbkNhbGxiYWNrLmggKi87IH07CiAJCUZFODBEN0E5MEU5 QzFFRDIwMDBENkY3NSAvKiBKU0N1c3RvbVBvc2l0aW9uRXJyb3JDYWxsYmFjay5jcHAgaW4gU291 cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBGRTgwRDdBNDBFOUMxRUQy MDAwRDZGNzUgLyogSlNDdXN0b21Qb3NpdGlvbkVycm9yQ2FsbGJhY2suY3BwICovOyB9OwpAQCAt OTI5MCw2ICs5MjkxLDcgQEAKIAkJRkU2RkQ0ODYwRjY3NkU1NzAwMDkyODczIC8qIENvb3JkaW5h dGVzLmlkbCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBs YXN0S25vd25GaWxlVHlwZSA9IHRleHQ7IHBhdGggPSBDb29yZGluYXRlcy5pZGw7IHNvdXJjZVRy ZWUgPSAiPGdyb3VwPiI7IH07CiAJCUZFNkZENDhCMEY2NzZFOTMwMDA5Mjg3MyAvKiBKU0Nvb3Jk aW5hdGVzLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0 OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IEpTQ29vcmRp bmF0ZXMuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlGRTZGRDQ4QzBGNjc2RTkz MDAwOTI4NzMgLyogSlNDb29yZGluYXRlcy5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7 IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBh dGggPSBKU0Nvb3JkaW5hdGVzLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCUZFNzAw REQwMEY5MkQ4MUEwMDhFMkJGRSAvKiBKU0Nvb3JkaW5hdGVzQ3VzdG9tLmNwcCAqLyA9IHtpc2Eg PSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9 IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IEpTQ29vcmRpbmF0ZXNDdXN0b20uY3BwOyBzb3Vy Y2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlGRTgwRDdBMjBFOUMxRUQyMDAwRDZGNzUgLyogSlND dXN0b21Qb3NpdGlvbkNhbGxiYWNrLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBm aWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsg cGF0aCA9IEpTQ3VzdG9tUG9zaXRpb25DYWxsYmFjay5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3Vw PiI7IH07CiAJCUZFODBEN0EzMEU5QzFFRDIwMDBENkY3NSAvKiBKU0N1c3RvbVBvc2l0aW9uQ2Fs bGJhY2suaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBs YXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gSlNDdXN0b21Qb3NpdGlv bkNhbGxiYWNrLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUZFODBEN0E0MEU5QzFF RDIwMDBENkY3NSAvKiBKU0N1c3RvbVBvc2l0aW9uRXJyb3JDYWxsYmFjay5jcHAgKi8gPSB7aXNh ID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUg PSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBKU0N1c3RvbVBvc2l0aW9uRXJyb3JDYWxsYmFj ay5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CkBAIC0xMzQ1Myw2ICsxMzQ1NSw3IEBA CiAJCQkJQkNBODNFNTEwRDdDRTIwNTAwMzQyMUE4IC8qIEpTQ2xpcGJvYXJkQ3VzdG9tLmNwcCAq LywKIAkJCQlDMERGQzg2RjBEQjY4NDFBMDAzRUFFN0MgLyogSlNDb25zb2xlQ3VzdG9tLmNwcCAq LywKIAkJCQlGRTgwRDdBMjBFOUMxRUQyMDAwRDZGNzUgLyogSlNDdXN0b21Qb3NpdGlvbkNhbGxi YWNrLmNwcCAqLywKKwkJCQlGRTcwMEREMDBGOTJEODFBMDA4RTJCRkUgLyogSlNDb29yZGluYXRl c0N1c3RvbS5jcHAgKi8sCiAJCQkJRkU4MEQ3QTMwRTlDMUVEMjAwMEQ2Rjc1IC8qIEpTQ3VzdG9t UG9zaXRpb25DYWxsYmFjay5oICovLAogCQkJCUZFODBEN0E0MEU5QzFFRDIwMDBENkY3NSAvKiBK U0N1c3RvbVBvc2l0aW9uRXJyb3JDYWxsYmFjay5jcHAgKi8sCiAJCQkJRkU4MEQ3QTUwRTlDMUVE MjAwMEQ2Rjc1IC8qIEpTQ3VzdG9tUG9zaXRpb25FcnJvckNhbGxiYWNrLmggKi8sCkBAIC0xODgz Nyw2ICsxODg0MCw3IEBACiAJCQkJOTNGOTI1NDQwRjdFRjVCODAwN0UzN0M5IC8qIENoZWNrZWRS YWRpb0J1dHRvbnMuY3BwIGluIFNvdXJjZXMgKi8sCiAJCQkJOTM4MTkyMDMwRjg3RTFFNjAwRDUz NTJBIC8qIEJpbmFyeVByb3BlcnR5TGlzdC5jcHAgaW4gU291cmNlcyAqLywKIAkJCQk5MzYzQjYy QzBGOEU4RkUwMDA4MDM4MTAgLyogSGlzdG9yeVByb3BlcnR5TGlzdC5jcHAgaW4gU291cmNlcyAq LywKKwkJCQlGRTcwMEREMTBGOTJEODFBMDA4RTJCRkUgLyogSlNDb29yZGluYXRlc0N1c3RvbS5j cHAgaW4gU291cmNlcyAqLywKIAkJCSk7CiAJCQlydW5Pbmx5Rm9yRGVwbG95bWVudFBvc3Rwcm9j ZXNzaW5nID0gMDsKIAkJfTsKSW5kZXg6IFdlYkNvcmUvYmluZGluZ3MvanMvSlNDb29yZGluYXRl c0N1c3RvbS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0Nvb3JkaW5h dGVzQ3VzdG9tLmNwcAkocmV2aXNpb24gMCkKKysrIFdlYkNvcmUvYmluZGluZ3MvanMvSlNDb29y ZGluYXRlc0N1c3RvbS5jcHAJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsNjcgQEAKKy8qCisgKiBD b3B5cmlnaHQgKEMpIDIwMDkgQXBwbGUgSW5jLiBBbGwgUmlnaHRzIFJlc2VydmVkLgorICoKKyAq IFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGgg b3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQg dGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0cmlidXRp b25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAg IG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xh aW1lci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVj ZSB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRp b25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVudGF0 aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9u LgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBgYEFTIElT JycgQU5EIEFOWQorICogRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywg QlVUIE5PVCBMSU1JVEVEIFRPLCBUSEUKKyAqIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFO VEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgorICogUFVSUE9TRSBBUkUgRElT Q0xBSU1FRC4gIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IKKyAqIENPTlRSSUJVVE9S UyBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFM LAorICogRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVU IE5PVCBMSU1JVEVEIFRPLAorICogUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBT RVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SCisgKiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJ TlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZCisgKiBPRiBMSUFC SUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKKyAq IChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBP VVQgT0YgVEhFIFVTRQorICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRI RSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4gCisgKi8KKworI2luY2x1ZGUgImNvbmZpZy5o IgorI2luY2x1ZGUgIkpTQ29vcmRpbmF0ZXMuaCIKKworI2luY2x1ZGUgIkNvb3JkaW5hdGVzLmgi CisKK3VzaW5nIG5hbWVzcGFjZSBKU0M7CisKK25hbWVzcGFjZSBXZWJDb3JlIHsKKyAgICAKK0pT VmFsdWVQdHIgSlNDb29yZGluYXRlczo6YWx0aXR1ZGUoRXhlY1N0YXRlKiBleGVjKSBjb25zdAor eworICAgIENvb3JkaW5hdGVzKiBpbXAgPSBpbXBsKCk7CisgICAgaWYgKCFpbXAtPmNhblByb3Zp ZGVBbHRpdHVkZSgpKQorICAgICAgICByZXR1cm4ganNOdWxsKCk7CisgICAgcmV0dXJuIGpzTnVt YmVyKGV4ZWMsIGltcC0+YWx0aXR1ZGUoKSk7Cit9CisKK0pTVmFsdWVQdHIgSlNDb29yZGluYXRl czo6YWx0aXR1ZGVBY2N1cmFjeShFeGVjU3RhdGUqIGV4ZWMpIGNvbnN0Cit7CisgICAgQ29vcmRp bmF0ZXMqIGltcCA9IGltcGwoKTsKKyAgICBpZiAoIWltcC0+Y2FuUHJvdmlkZUFsdGl0dWRlQWNj dXJhY3koKSkKKyAgICAgICAgcmV0dXJuIGpzTnVsbCgpOworICAgIHJldHVybiBqc051bWJlcihl eGVjLCBpbXAtPmFsdGl0dWRlQWNjdXJhY3koKSk7Cit9CisKK0pTVmFsdWVQdHIgSlNDb29yZGlu YXRlczo6aGVhZGluZyhFeGVjU3RhdGUqIGV4ZWMpIGNvbnN0Cit7CisgICAgQ29vcmRpbmF0ZXMq IGltcCA9IGltcGwoKTsKKyAgICBpZiAoIWltcC0+Y2FuUHJvdmlkZUhlYWRpbmcoKSkKKyAgICAg ICAgcmV0dXJuIGpzTnVsbCgpOworICAgIHJldHVybiBqc051bWJlcihleGVjLCBpbXAtPmhlYWRp bmcoKSk7Cit9CisKK0pTVmFsdWVQdHIgSlNDb29yZGluYXRlczo6c3BlZWQoRXhlY1N0YXRlKiBl eGVjKSBjb25zdAoreworICAgIENvb3JkaW5hdGVzKiBpbXAgPSBpbXBsKCk7CisgICAgaWYgKCFp bXAtPmNhblByb3ZpZGVTcGVlZCgpKQorICAgICAgICByZXR1cm4ganNOdWxsKCk7CisgICAgcmV0 dXJuIGpzTnVtYmVyKGV4ZWMsIGltcC0+c3BlZWQoKSk7Cit9CisKK30gLy8gbmFtZXNwYWNlIFdl YkNvcmUKSW5kZXg6IFdlYkNvcmUvcGFnZS9Db29yZGluYXRlcy5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YkNvcmUvcGFnZS9Db29yZGluYXRlcy5oCShyZXZpc2lvbiA0MjQzMCkKKysrIFdlYkNvcmUvcGFn ZS9Db29yZGluYXRlcy5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNiw3ICszNiw3IEBAIHR5cGVkZWYg aW50IEV4Y2VwdGlvbkNvZGU7CiAKIGNsYXNzIENvb3JkaW5hdGVzIDogcHVibGljIFJlZkNvdW50 ZWQ8Q29vcmRpbmF0ZXM+IHsKIHB1YmxpYzoKLSAgICBzdGF0aWMgUGFzc1JlZlB0cjxDb29yZGlu YXRlcz4gY3JlYXRlKGRvdWJsZSBsYXRpdHVkZSwgZG91YmxlIGxvbmdpdHVkZSwgZG91YmxlIGFs dGl0dWRlLCBkb3VibGUgYWNjdXJhY3ksIGRvdWJsZSBhbHRpdHVkZUFjY3VyYWN5LCBkb3VibGUg aGVhZGluZywgZG91YmxlIHNwZWVkKSB7IHJldHVybiBhZG9wdFJlZihuZXcgQ29vcmRpbmF0ZXMo bGF0aXR1ZGUsIGxvbmdpdHVkZSwgYWx0aXR1ZGUsIGFjY3VyYWN5LCBhbHRpdHVkZUFjY3VyYWN5 LCBoZWFkaW5nLCBzcGVlZCkpOyB9CisgICAgc3RhdGljIFBhc3NSZWZQdHI8Q29vcmRpbmF0ZXM+ IGNyZWF0ZShkb3VibGUgbGF0aXR1ZGUsIGRvdWJsZSBsb25naXR1ZGUsIGJvb2wgcHJvdmlkZXNB bHRpdHVkZSwgZG91YmxlIGFsdGl0dWRlLCBkb3VibGUgYWNjdXJhY3ksIGJvb2wgcHJvdmlkZXNB bHRpdHVkZUFjY3VyYWN5LCBkb3VibGUgYWx0aXR1ZGVBY2N1cmFjeSwgYm9vbCBwcm92aWRlc0hl YWRpbmcsIGRvdWJsZSBoZWFkaW5nLCBib29sIHByb3ZpZGVzU3BlZWQsIGRvdWJsZSBzcGVlZCkg eyByZXR1cm4gYWRvcHRSZWYobmV3IENvb3JkaW5hdGVzKGxhdGl0dWRlLCBsb25naXR1ZGUsIHBy b3ZpZGVzQWx0aXR1ZGUsIGFsdGl0dWRlLCBhY2N1cmFjeSwgcHJvdmlkZXNBbHRpdHVkZUFjY3Vy YWN5LCBhbHRpdHVkZUFjY3VyYWN5LCBwcm92aWRlc0hlYWRpbmcsIGhlYWRpbmcsIHByb3ZpZGVz U3BlZWQsIHNwZWVkKSk7IH0KICAgICAKICAgICBkb3VibGUgbGF0aXR1ZGUoKSBjb25zdCB7IHJl dHVybiBtX2xhdGl0dWRlOyB9CiAgICAgZG91YmxlIGxvbmdpdHVkZSgpIGNvbnN0IHsgcmV0dXJu IG1fbG9uZ2l0dWRlOyB9CkBAIC00NiwxMCArNDYsMTUgQEAgcHVibGljOgogICAgIGRvdWJsZSBo ZWFkaW5nKCkgY29uc3QgeyByZXR1cm4gbV9oZWFkaW5nOyB9CiAgICAgZG91YmxlIHNwZWVkKCkg Y29uc3QgeyByZXR1cm4gbV9zcGVlZDsgfQogCisgICAgYm9vbCBjYW5Qcm92aWRlQWx0aXR1ZGUo KSBjb25zdCB7IHJldHVybiBtX2NhblByb3ZpZGVBbHRpdHVkZTsgfQorICAgIGJvb2wgY2FuUHJv dmlkZUFsdGl0dWRlQWNjdXJhY3koKSBjb25zdCB7IHJldHVybiBtX2NhblByb3ZpZGVBbHRpdHVk ZUFjY3VyYWN5OyB9CisgICAgYm9vbCBjYW5Qcm92aWRlSGVhZGluZygpIGNvbnN0IHsgcmV0dXJu IG1fY2FuUHJvdmlkZUhlYWRpbmc7IH0KKyAgICBib29sIGNhblByb3ZpZGVTcGVlZCgpIGNvbnN0 IHsgcmV0dXJuIG1fY2FuUHJvdmlkZVNwZWVkOyB9CisgICAgCiAgICAgU3RyaW5nIHRvU3RyaW5n KCkgY29uc3Q7CiAKIHByaXZhdGU6Ci0gICAgQ29vcmRpbmF0ZXMoZG91YmxlIGxhdGl0dWRlLCBk b3VibGUgbG9uZ2l0dWRlLCBkb3VibGUgYWx0aXR1ZGUsIGRvdWJsZSBhY2N1cmFjeSwgZG91Ymxl IGFsdGl0dWRlQWNjdXJhY3ksIGRvdWJsZSBoZWFkaW5nLCBkb3VibGUgc3BlZWQpCisgICAgQ29v cmRpbmF0ZXMoZG91YmxlIGxhdGl0dWRlLCBkb3VibGUgbG9uZ2l0dWRlLCBib29sIHByb3ZpZGVz QWx0aXR1ZGUsIGRvdWJsZSBhbHRpdHVkZSwgZG91YmxlIGFjY3VyYWN5LCBib29sIHByb3ZpZGVz QWx0aXR1ZGVBY2N1cmFjeSwgZG91YmxlIGFsdGl0dWRlQWNjdXJhY3ksIGJvb2wgcHJvdmlkZXNI ZWFkaW5nLCBkb3VibGUgaGVhZGluZywgYm9vbCBwcm92aWRlc1NwZWVkLCBkb3VibGUgc3BlZWQp CiAgICAgICAgIDogbV9sYXRpdHVkZShsYXRpdHVkZSkKICAgICAgICAgLCBtX2xvbmdpdHVkZShs b25naXR1ZGUpCiAgICAgICAgICwgbV9hbHRpdHVkZShhbHRpdHVkZSkKQEAgLTU3LDYgKzYyLDEw IEBAIHByaXZhdGU6CiAgICAgICAgICwgbV9hbHRpdHVkZUFjY3VyYWN5KGFsdGl0dWRlQWNjdXJh Y3kpCiAgICAgICAgICwgbV9oZWFkaW5nKGhlYWRpbmcpCiAgICAgICAgICwgbV9zcGVlZChzcGVl ZCkKKyAgICAgICAgLCBtX2NhblByb3ZpZGVBbHRpdHVkZShwcm92aWRlc0FsdGl0dWRlKQorICAg ICAgICAsIG1fY2FuUHJvdmlkZUFsdGl0dWRlQWNjdXJhY3kocHJvdmlkZXNBbHRpdHVkZUFjY3Vy YWN5KQorICAgICAgICAsIG1fY2FuUHJvdmlkZUhlYWRpbmcocHJvdmlkZXNIZWFkaW5nKQorICAg ICAgICAsIG1fY2FuUHJvdmlkZVNwZWVkKHByb3ZpZGVzU3BlZWQpCiAgICAgewogICAgIH0KIApA QCAtNjcsNiArNzYsMTEgQEAgcHJpdmF0ZToKICAgICBkb3VibGUgbV9hbHRpdHVkZUFjY3VyYWN5 OwogICAgIGRvdWJsZSBtX2hlYWRpbmc7CiAgICAgZG91YmxlIG1fc3BlZWQ7CisgICAgCisgICAg Ym9vbCBtX2NhblByb3ZpZGVBbHRpdHVkZTsKKyAgICBib29sIG1fY2FuUHJvdmlkZUFsdGl0dWRl QWNjdXJhY3k7CisgICAgYm9vbCBtX2NhblByb3ZpZGVIZWFkaW5nOworICAgIGJvb2wgbV9jYW5Q cm92aWRlU3BlZWQ7CiB9OwogICAgIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpJbmRleDogV2Vi Q29yZS9wYWdlL0Nvb3JkaW5hdGVzLmlkbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BhZ2UvQ29v cmRpbmF0ZXMuaWRsCShyZXZpc2lvbiA0MjQzMCkKKysrIFdlYkNvcmUvcGFnZS9Db29yZGluYXRl cy5pZGwJKHdvcmtpbmcgY29weSkKQEAgLTI4LDExICsyOCwxMSBAQCBtb2R1bGUgY29yZSB7CiAg ICAgaW50ZXJmYWNlIENvb3JkaW5hdGVzIHsKICAgICAgICAgcmVhZG9ubHkgYXR0cmlidXRlIGRv dWJsZSBsYXRpdHVkZTsKICAgICAgICAgcmVhZG9ubHkgYXR0cmlidXRlIGRvdWJsZSBsb25naXR1 ZGU7Ci0gICAgICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSBkb3VibGUgYWx0aXR1ZGU7CisgICAgICAg IHJlYWRvbmx5IGF0dHJpYnV0ZSBbQ3VzdG9tXSBkb3VibGUgYWx0aXR1ZGU7CiAgICAgICAgIHJl YWRvbmx5IGF0dHJpYnV0ZSBkb3VibGUgYWNjdXJhY3k7Ci0gICAgICAgIHJlYWRvbmx5IGF0dHJp YnV0ZSBkb3VibGUgYWx0aXR1ZGVBY2N1cmFjeTsKLSAgICAgICAgcmVhZG9ubHkgYXR0cmlidXRl IGRvdWJsZSBoZWFkaW5nOwotICAgICAgICByZWFkb25seSBhdHRyaWJ1dGUgZG91YmxlIHNwZWVk OworICAgICAgICByZWFkb25seSBhdHRyaWJ1dGUgW0N1c3RvbV0gZG91YmxlIGFsdGl0dWRlQWNj dXJhY3k7CisgICAgICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSBbQ3VzdG9tXSBkb3VibGUgaGVhZGlu ZzsKKyAgICAgICAgcmVhZG9ubHkgYXR0cmlidXRlIFtDdXN0b21dIGRvdWJsZSBzcGVlZDsKIAog I2lmIGRlZmluZWQoTEFOR1VBR0VfSkFWQVNDUklQVCkKICAgICAgICAgW0RvbnRFbnVtXSBET01T dHJpbmcgdG9TdHJpbmcoKTsKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vbWFjL0dlb2xvY2F0aW9u U2VydmljZU1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL21hYy9HZW9sb2Nh dGlvblNlcnZpY2VNYWMubW0JKHJldmlzaW9uIDQyNDMwKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9t YWMvR2VvbG9jYXRpb25TZXJ2aWNlTWFjLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0xNTMsMjYgKzE1 MywzNiBAQCB2b2lkIEdlb2xvY2F0aW9uU2VydmljZU1hYzo6ZXJyb3JPY2N1cnJlCiAgICAgVU5V U0VEX1BBUkFNKG9sZExvY2F0aW9uKTsKIAogICAgIC8vIE5vcm1hbGl6ZQorICAgIGJvb2wgY2Fu UHJvdmlkZUFsdGl0dWRlID0gdHJ1ZTsKKyAgICBib29sIGNhblByb3ZpZGVBbHRpdHVkZUFjY3Vy YWN5ID0gdHJ1ZTsKICAgICBkb3VibGUgYWx0aXR1ZGUgPSBuZXdMb2NhdGlvbi5hbHRpdHVkZTsK ICAgICBkb3VibGUgYWx0aXR1ZGVBY2N1cmFjeSA9IG5ld0xvY2F0aW9uLnZlcnRpY2FsQWNjdXJh Y3k7CiAgICAgaWYgKGFsdGl0dWRlQWNjdXJhY3kgPCAwLjApIHsKLSAgICAgICAgYWx0aXR1ZGVB Y2N1cmFjeSA9IDAuMDsKLSAgICAgICAgYWx0aXR1ZGUgPSAwLjA7CisgICAgICAgIGNhblByb3Zp ZGVBbHRpdHVkZSA9IGZhbHNlOworICAgICAgICBjYW5Qcm92aWRlQWx0aXR1ZGVBY2N1cmFjeSA9 IGZhbHNlOwogICAgIH0KKyAgICAKKyAgICBib29sIGNhblByb3ZpZGVTcGVlZCA9IHRydWU7CiAg ICAgZG91YmxlIHNwZWVkID0gbmV3TG9jYXRpb24uc3BlZWQ7CiAgICAgaWYgKHNwZWVkIDwgMC4w KQotICAgICAgICBzcGVlZCA9IDAuMDsKKyAgICAgICAgY2FuUHJvdmlkZVNwZWVkID0gZmFsc2U7 CisKKyAgICBib29sIGNhblByb3ZpZGVIZWFkaW5nID0gdHJ1ZTsKICAgICBkb3VibGUgaGVhZGlu ZyA9IG5ld0xvY2F0aW9uLmNvdXJzZTsKICAgICBpZiAoaGVhZGluZyA8IDAuMCkKLSAgICAgICAg aGVhZGluZyA9IDAuMDsKKyAgICAgICAgY2FuUHJvdmlkZUhlYWRpbmcgPSBmYWxzZTsKICAgICAK ICAgICBXVEY6OlJlZlB0cjxXZWJDb3JlOjpDb29yZGluYXRlcz4gbmV3Q29vcmRpbmF0ZXMgPSBX ZWJDb3JlOjpDb29yZGluYXRlczo6Y3JlYXRlKAogICAgICAgICAgICAgICAgICAgICAgICAgICAg IG5ld0xvY2F0aW9uLmNvb3JkaW5hdGUubGF0aXR1ZGUsCiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgbmV3TG9jYXRpb24uY29vcmRpbmF0ZS5sb25naXR1ZGUsCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgY2FuUHJvdmlkZUFsdGl0dWRlLAogICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGFsdGl0dWRlLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5ld0xvY2F0aW9uLmhv cml6b250YWxBY2N1cmFjeSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBjYW5Qcm92aWRl QWx0aXR1ZGVBY2N1cmFjeSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBhbHRpdHVkZUFj Y3VyYWN5LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNhblByb3ZpZGVIZWFkaW5nLAog ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGhlYWRpbmcsCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgY2FuUHJvdmlkZVNwZWVkLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNw ZWVkKTsKICAgICBXVEY6OlJlZlB0cjxXZWJDb3JlOjpHZW9wb3NpdGlvbj4gbmV3UG9zaXRpb24g PSBXZWJDb3JlOjpHZW9wb3NpdGlvbjo6Y3JlYXRlKAogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBuZXdDb29yZGluYXRlcy5yZWxlYXNlKCksCg==