178535 2017-10-19 12:49:41 -0700 [Payment Request] Only process shipping options if shipping is requested, and throw an exception on duplicate shipping option IDs 2017-11-15 13:08:41 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 aestes aestes achristensen commit-queue dbates sam thorton webkit-bug-importer youennf oldest_to_newest 1362261 0 aestes 2017-10-19 12:49:41 -0700 [Payment Request] Only process shipping options if shipping is requested, and throw an exception on duplicate shipping option IDs 1362262 1 324265 aestes 2017-10-19 12:50:44 -0700 Created attachment 324265 Patch 1362264 2 aestes 2017-10-19 13:02:34 -0700 Committed r223701: <https://trac.webkit.org/changeset/223701> 1372376 3 webkit-bug-importer 2017-11-15 13:08:41 -0800 <rdar://problem/35568864> 324265 2017-10-19 12:50:44 -0700 2017-10-19 13:02:45 -0700 Patch bug-178535-20171019125043.patch text/plain 6144 aestes U3VidmVyc2lvbiBSZXZpc2lvbjogMjIzNjk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjMyZTY0MWIzZWMzYTgw ZDc5ZDUzMmJkZTYzMGRlMzNhZjRiY2JmYi4uZGMwMzEzYmFjZmJiMjI0OTdmNWJjMWEwZmYzNTFk N2IzNGRlZGIxOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE3LTEwLTE5ICBBbmR5 IEVzdGVzICA8YWVzdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBbUGF5bWVudCBSZXF1ZXN0XSBP bmx5IHByb2Nlc3Mgc2hpcHBpbmcgb3B0aW9ucyBpZiBzaGlwcGluZyBpcyByZXF1ZXN0ZWQsIGFu ZCB0aHJvdyBhbiBleGNlcHRpb24gb24gZHVwbGljYXRlIHNoaXBwaW5nIG9wdGlvbiBJRHMKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3ODUzNQorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFByb2dyZXNzZXMg Zm91ciB0ZXN0cyBpbiB3ZWItcGxhdGZvcm0tdGVzdHMvcGF5bWVudC1yZXF1ZXN0L3BheW1lbnQt cmVxdWVzdC1jb25zdHJ1Y3Rvci5odHRwcy5odG1sLgorCisgICAgICAgICogTW9kdWxlcy9wYXlt ZW50cmVxdWVzdC9QYXltZW50UmVxdWVzdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQYXltZW50 UmVxdWVzdDo6Y3JlYXRlKToKKwogMjAxNy0xMC0xOSAgRGFuaWVsIEJhdGVzICA8ZGFiYXRlc0Bh cHBsZS5jb20+CiAKICAgICAgICAgUmVmZXJyZXIgcG9saWN5IHNob3VsZCBiZSBpbmhlcml0ZWQg ZnJvbSBjcmVhdG9yCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3BheW1lbnRy ZXF1ZXN0L1BheW1lbnRSZXF1ZXN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvcGF5bWVu dHJlcXVlc3QvUGF5bWVudFJlcXVlc3QuY3BwCmluZGV4IDIwOWJmY2Y3YzdmZDk5MjYwYmMyZGYz MWIyNjEzNDgzMWVkNmJhNWQuLmJmZWNmNWZhNzU2NzVjMzdiMmRlZDM2OWI2N2Q2NTJjNTM0NDll ZGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvcGF5bWVudHJlcXVlc3QvUGF5 bWVudFJlcXVlc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvcGF5bWVudHJlcXVl c3QvUGF5bWVudFJlcXVlc3QuY3BwCkBAIC0yNzgsMjEgKzI3OCwyMCBAQCBFeGNlcHRpb25PcjxS ZWY8UGF5bWVudFJlcXVlc3Q+PiBQYXltZW50UmVxdWVzdDo6Y3JlYXRlKERvY3VtZW50JiBkb2N1 bWVudCwgVmVjdAogICAgIH0KIAogICAgIFN0cmluZyBzZWxlY3RlZFNoaXBwaW5nT3B0aW9uOwot ICAgIEhhc2hTZXQ8U3RyaW5nPiBzZWVuU2hpcHBpbmdPcHRpb25JRHM7Ci0gICAgZm9yIChhdXRv JiBzaGlwcGluZ09wdGlvbiA6IGRldGFpbHMuc2hpcHBpbmdPcHRpb25zKSB7Ci0gICAgICAgIGF1 dG8gZXhjZXB0aW9uID0gY2hlY2tBbmRDYW5vbmljYWxpemVBbW91bnQoc2hpcHBpbmdPcHRpb24u YW1vdW50KTsKLSAgICAgICAgaWYgKGV4Y2VwdGlvbi5oYXNFeGNlcHRpb24oKSkKLSAgICAgICAg ICAgIHJldHVybiBleGNlcHRpb24ucmVsZWFzZUV4Y2VwdGlvbigpOworICAgIGlmIChvcHRpb25z LnJlcXVlc3RTaGlwcGluZykgeworICAgICAgICBIYXNoU2V0PFN0cmluZz4gc2VlblNoaXBwaW5n T3B0aW9uSURzOworICAgICAgICBmb3IgKGF1dG8mIHNoaXBwaW5nT3B0aW9uIDogZGV0YWlscy5z aGlwcGluZ09wdGlvbnMpIHsKKyAgICAgICAgICAgIGF1dG8gZXhjZXB0aW9uID0gY2hlY2tBbmRD YW5vbmljYWxpemVBbW91bnQoc2hpcHBpbmdPcHRpb24uYW1vdW50KTsKKyAgICAgICAgICAgIGlm IChleGNlcHRpb24uaGFzRXhjZXB0aW9uKCkpCisgICAgICAgICAgICAgICAgcmV0dXJuIGV4Y2Vw dGlvbi5yZWxlYXNlRXhjZXB0aW9uKCk7CiAKLSAgICAgICAgYXV0byBhZGRSZXN1bHQgPSBzZWVu U2hpcHBpbmdPcHRpb25JRHMuYWRkKHNoaXBwaW5nT3B0aW9uLmlkKTsKLSAgICAgICAgaWYgKCFh ZGRSZXN1bHQuaXNOZXdFbnRyeSkgewotICAgICAgICAgICAgZGV0YWlscy5zaGlwcGluZ09wdGlv bnMgPSB7IH07Ci0gICAgICAgICAgICBzZWxlY3RlZFNoaXBwaW5nT3B0aW9uID0geyB9OwotICAg ICAgICAgICAgYnJlYWs7Ci0gICAgICAgIH0KKyAgICAgICAgICAgIGF1dG8gYWRkUmVzdWx0ID0g c2VlblNoaXBwaW5nT3B0aW9uSURzLmFkZChzaGlwcGluZ09wdGlvbi5pZCk7CisgICAgICAgICAg ICBpZiAoIWFkZFJlc3VsdC5pc05ld0VudHJ5KQorICAgICAgICAgICAgICAgIHJldHVybiBFeGNl cHRpb24geyBUeXBlRXJyb3IsICJTaGlwcGluZyBvcHRpb24gSURzIG11c3QgYmUgdW5pcXVlLiIg fTsKIAotICAgICAgICBpZiAoc2hpcHBpbmdPcHRpb24uc2VsZWN0ZWQpCi0gICAgICAgICAgICBz ZWxlY3RlZFNoaXBwaW5nT3B0aW9uID0gc2hpcHBpbmdPcHRpb24uaWQ7CisgICAgICAgICAgICBp ZiAoc2hpcHBpbmdPcHRpb24uc2VsZWN0ZWQpCisgICAgICAgICAgICAgICAgc2VsZWN0ZWRTaGlw cGluZ09wdGlvbiA9IHNoaXBwaW5nT3B0aW9uLmlkOworICAgICAgICB9CiAgICAgfQogCiAgICAg VmVjdG9yPFN0cmluZz4gc2VyaWFsaXplZE1vZGlmaWVyRGF0YTsKZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mv Q2hhbmdlTG9nCmluZGV4IDcyODBkOGI3MzExYTE4NjdhMDRlOTkxYjcxMDA4YTRiMWRlMTkzMmIu LjU4YWU2ZDYwZGFmY2QzODM0Y2MzNGY0ZjQ4ZWZkOWVkNzVkOWNjNTIgMTAwNjQ0Ci0tLSBhL0xh eW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0 ZWQvdzNjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDE3LTEwLTE5ICBBbmR5IEVzdGVz ICA8YWVzdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBbUGF5bWVudCBSZXF1ZXN0XSBPbmx5IHBy b2Nlc3Mgc2hpcHBpbmcgb3B0aW9ucyBpZiBzaGlwcGluZyBpcyByZXF1ZXN0ZWQsIGFuZCB0aHJv dyBhbiBleGNlcHRpb24gb24gZHVwbGljYXRlIHNoaXBwaW5nIG9wdGlvbiBJRHMKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3ODUzNQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogd2ViLXBsYXRmb3JtLXRl c3RzL3BheW1lbnQtcmVxdWVzdC9wYXltZW50LXJlcXVlc3QtY29uc3RydWN0b3IuaHR0cHMtZXhw ZWN0ZWQudHh0OgorCiAyMDE3LTEwLTE5ICBEZWFuIEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4K IAogICAgICAgICBJbXBvcnQgVzNDIFdlYiBQbGF0Zm9ybSBUZXN0cyBmb3IgY3JlYXRlSW1hZ2VC aXRtYXAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t dGVzdHMvcGF5bWVudC1yZXF1ZXN0L3BheW1lbnQtcmVxdWVzdC1jb25zdHJ1Y3Rvci5odHRwcy1l eHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz L3BheW1lbnQtcmVxdWVzdC9wYXltZW50LXJlcXVlc3QtY29uc3RydWN0b3IuaHR0cHMtZXhwZWN0 ZWQudHh0CmluZGV4IGMxYmRjOWQ1MTMxYTYxY2YxY2M4NDdmMjI1YzdjZDlhYzVjN2NmMDcuLjIw Y2M4YjFkOTAwNzFhNDQ1MDkzMjU1NjZhY2IxYTMyNDgzMzQ2YzUgMTAwNjQ0Ci0tLSBhL0xheW91 dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvcGF5bWVudC1yZXF1ZXN0L3Bh eW1lbnQtcmVxdWVzdC1jb25zdHJ1Y3Rvci5odHRwcy1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0 VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9wYXltZW50LXJlcXVlc3QvcGF5 bWVudC1yZXF1ZXN0LWNvbnN0cnVjdG9yLmh0dHBzLWV4cGVjdGVkLnR4dApAQCAtMTUsMTQgKzE1 LDEwIEBAIFBBU1MgTmVnYXRpdmUgdmFsdWVzIGFyZSBhbGxvd2VkIGZvciBkaXNwbGF5SXRlbXMu YW1vdW50LnZhbHVlLCBpcnJlc3BlY3RpdmUgb2YKIFBBU1MgaXQgaGFuZGxlcyBoaWdoIHByZWNp c2lvbiBjdXJyZW5jeSB2YWx1ZXMgd2l0aG91dCB0aHJvd2luZyAKIFBBU1MgRm9yIGVhY2ggb3B0 aW9uIGluIGRldGFpbHMuc2hpcHBpbmdPcHRpb25zOiBpZiBvcHRpb24uYW1vdW50LnZhbHVlIGlz IG5vdCBhIHZhbGlkIGRlY2ltYWwgbW9uZXRhcnkgdmFsdWUsIHRoZW4gdGhyb3cgYSBUeXBlRXJy b3IgCiBQQVNTIElmIHRoZXJlIGlzIG5vIHNlbGVjdGVkIHNoaXBwaW5nIG9wdGlvbiwgdGhlbiBQ YXltZW50UmVxdWVzdC5zaGlwcGluZ09wdGlvbiByZW1haW5zIG51bGwgCi1GQUlMIElmIHRoZXJl IGlzIGEgc2VsZWN0ZWQgc2hpcHBpbmcgb3B0aW9uLCBhbmQgcmVxdWVzdFNoaXBwaW5nIGlzIHNl dCwgdGhlbiB0aGF0IG9wdGlvbiBiZWNvbWVzIHN5bmNocm9ub3VzbHkgc2VsZWN0ZWQgYXNzZXJ0 X2VxdWFsczogTXVzdCBiZSBudWxsIHdoZW4gbm8gc2hpcHBpbmcgaXMgcmVxdWVzdGVkIChkZWZh dWx0cyB0byBmYWxzZSkgZXhwZWN0ZWQgKG9iamVjdCkgbnVsbCBidXQgZ290IChzdHJpbmcpICJ0 aGUtaWQiCi1GQUlMIElmIHJlcXVlc3RTaGlwcGluZyBpcyBzZXQsIGFuZCBpZiB0aGVyZSBpcyBh IG11bHRpcGxlIHNlbGVjdGVkIHNoaXBwaW5nIG9wdGlvbnMsIG9ubHkgdGhlIGxhc3QgaXMgc2Vs ZWN0ZWQuIGFzc2VydF9lcXVhbHM6IHNoaXBwaW5nT3B0aW9uIG11c3QgYmUgbnVsbCwgYXMgcmVx dWVzdFNoaXBwaW5nIGlzIGZhbHNlIGV4cGVjdGVkIChvYmplY3QpIG51bGwgYnV0IGdvdCAoc3Ry aW5nKSAidGhlLWlkIgotRkFJTCBJZiB0aGVyZSBhcmUgYW55IGR1cGxpY2F0ZSBzaGlwcGluZyBv cHRpb24gaWRzLCBhbmQgc2hpcHBpbmcgaXMgcmVxdWVzdGVkLCB0aGVuIHRocm93IGEgVHlwZUVy cm9yIGFzc2VydF90aHJvd3M6IEV4cGVjdGVkIHRvIHRocm93IGEgVHlwZUVycm9yIGJlY2F1c2Ug ZHVwbGljYXRlIElEcyBmdW5jdGlvbiAiKCkgPT4gewotICAgICAgbmV3IFBheW1lbnRSZXF1ZXN0 KGRlZmF1bHRNZXRob2RzLCBkZXRhaWxzLCB7IHJlcXVlc3RTaGlwcGluZzogdHJ1ZSB9KTsKLSAg ICB9IiBkaWQgbm90IHRocm93Ci1GQUlMIFRocm93IHdoZW4gdGhlcmUgYXJlIGR1cGxpY2F0ZSBz aGlwcGluZ09wdGlvbiBpZHMsIGV2ZW4gaWYgb3RoZXIgdmFsdWVzIGFyZSBkaWZmZXJlbnQgYXNz ZXJ0X3Rocm93czogRXhwZWN0ZWQgdG8gdGhyb3cgYSBUeXBlRXJyb3IgYmVjYXVzZSBkdXBsaWNh dGUgSURzIGZ1bmN0aW9uICIoKSA9PiB7Ci0gICAgICBuZXcgUGF5bWVudFJlcXVlc3QoZGVmYXVs dE1ldGhvZHMsIGRldGFpbHMsIHsgcmVxdWVzdFNoaXBwaW5nOiB0cnVlIH0pOwotICAgIH0iIGRp ZCBub3QgdGhyb3cKK1BBU1MgSWYgdGhlcmUgaXMgYSBzZWxlY3RlZCBzaGlwcGluZyBvcHRpb24s IGFuZCByZXF1ZXN0U2hpcHBpbmcgaXMgc2V0LCB0aGVuIHRoYXQgb3B0aW9uIGJlY29tZXMgc3lu Y2hyb25vdXNseSBzZWxlY3RlZCAKK1BBU1MgSWYgcmVxdWVzdFNoaXBwaW5nIGlzIHNldCwgYW5k IGlmIHRoZXJlIGlzIGEgbXVsdGlwbGUgc2VsZWN0ZWQgc2hpcHBpbmcgb3B0aW9ucywgb25seSB0 aGUgbGFzdCBpcyBzZWxlY3RlZC4gCitQQVNTIElmIHRoZXJlIGFyZSBhbnkgZHVwbGljYXRlIHNo aXBwaW5nIG9wdGlvbiBpZHMsIGFuZCBzaGlwcGluZyBpcyByZXF1ZXN0ZWQsIHRoZW4gdGhyb3cg YSBUeXBlRXJyb3IgCitQQVNTIFRocm93IHdoZW4gdGhlcmUgYXJlIGR1cGxpY2F0ZSBzaGlwcGlu Z09wdGlvbiBpZHMsIGV2ZW4gaWYgb3RoZXIgdmFsdWVzIGFyZSBkaWZmZXJlbnQgCiBQQVNTIFRo cm93IFR5cGVFcnJvciBpZiBtb2RpZmllci50b3RhbC5hbW91bnQudmFsdWUgaXMgbm90IGEgdmFs aWQgZGVjaW1hbCBtb25ldGFyeSB2YWx1ZSAKIFBBU1MgSWYgYW1vdW50LnZhbHVlIG9mIGFkZGl0 aW9uYWxEaXNwbGF5SXRlbXMgaXMgbm90IGEgdmFsaWQgZGVjaW1hbCBtb25ldGFyeSB2YWx1ZSwg dGhlbiB0aHJvdyBhIFR5cGVFcnJvciAKIFBBU1MgTW9kaWZpZXIgZGF0YSBtdXN0IGJlIEpTT04t c2VyaWFsaXphYmxlIG9iamVjdCAoYW4gQXJyYXkgaW4gdGhpcyBjYXNlKSAK