<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<!DOCTYPE bugzilla SYSTEM "https://bugs.webkit.org/page.cgi?id=bugzilla.dtd">

<bugzilla version="5.0.4.1"
          urlbase="https://bugs.webkit.org/"
          
          maintainer="admin@webkit.org"
>

    <bug>
          <bug_id>139367</bug_id>
          
          <creation_ts>2014-12-07 08:25:01 -0800</creation_ts>
          <short_desc>[GStreamer] Minor cleanups of AudioFileReader implementation</short_desc>
          <delta_ts>2014-12-08 01:26:10 -0800</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>Media</component>
          <version>528+ (Nightly build)</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords></keywords>
          <priority>P2</priority>
          <bug_severity>Minor</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Sebastian Dröge (slomo)">slomo</reporter>
          <assigned_to name="Sebastian Dröge (slomo)">slomo</assigned_to>
          <cc>commit-queue</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1053155</commentid>
    <comment_count>0</comment_count>
    <who name="Sebastian Dröge (slomo)">slomo</who>
    <bug_when>2014-12-07 08:25:01 -0800</bug_when>
    <thetext>Patch coming in a few seconds</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1053156</commentid>
    <comment_count>1</comment_count>
      <attachid>242745</attachid>
    <who name="Sebastian Dröge (slomo)">slomo</who>
    <bug_when>2014-12-07 08:26:44 -0800</bug_when>
    <thetext>Created attachment 242745
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1053159</commentid>
    <comment_count>2</comment_count>
      <attachid>242747</attachid>
    <who name="Sebastian Dröge (slomo)">slomo</who>
    <bug_when>2014-12-07 08:35:21 -0800</bug_when>
    <thetext>Created attachment 242747
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1053164</commentid>
    <comment_count>3</comment_count>
      <attachid>242749</attachid>
    <who name="Sebastian Dröge (slomo)">slomo</who>
    <bug_when>2014-12-07 08:44:38 -0800</bug_when>
    <thetext>Created attachment 242749
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1053166</commentid>
    <comment_count>4</comment_count>
      <attachid>242751</attachid>
    <who name="Sebastian Dröge (slomo)">slomo</who>
    <bug_when>2014-12-07 09:10:48 -0800</bug_when>
    <thetext>Created attachment 242751
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1053224</commentid>
    <comment_count>5</comment_count>
      <attachid>242766</attachid>
    <who name="Sebastian Dröge (slomo)">slomo</who>
    <bug_when>2014-12-07 13:15:28 -0800</bug_when>
    <thetext>Created attachment 242766
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1053226</commentid>
    <comment_count>6</comment_count>
      <attachid>242766</attachid>
    <who name="Philippe Normand">pnormand</who>
    <bug_when>2014-12-07 13:18:12 -0800</bug_when>
    <thetext>Comment on attachment 242766
Patch

Looks good, thanks!</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1053316</commentid>
    <comment_count>7</comment_count>
      <attachid>242766</attachid>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2014-12-08 01:26:07 -0800</bug_when>
    <thetext>Comment on attachment 242766
Patch

Clearing flags on attachment: 242766

Committed r176941: &lt;http://trac.webkit.org/changeset/176941&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1053317</commentid>
    <comment_count>8</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2014-12-08 01:26:10 -0800</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>242745</attachid>
            <date>2014-12-07 08:26:44 -0800</date>
            <delta_ts>2014-12-07 08:35:16 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-139367-20141207172807.patch</filename>
            <type>text/plain</type>
            <size>6806</size>
            <attacher name="Sebastian Dröge (slomo)">slomo</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2OTE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODMzOWQ3Y2ViOTVjMDRh
ZmMwNTVhMzFkNDY0ZjA3NTFjOGM2ZTk0MC4uYWZkYmY1NjBjNzM0NWE3MGJkMTQyNTVhMmI2YTcz
MjVlOGFkYTY5MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5IEBACisyMDE0LTEyLTA3ICBTZWJh
c3RpYW4gRHLDtmdlICA8c2ViYXN0aWFuQGNlbnRyaWN1bGFyLmNvbT4KKworICAgICAgICBbR1N0
cmVhbWVyXSBNaW5vciBjbGVhbnVwIG9mIHRoZSBBdWRpb0ZpbGVSZWFkZXIgaW1wbGVtZW50YXRp
b24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzOTM2
NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxh
dGZvcm0vYXVkaW8vZ3N0cmVhbWVyL0F1ZGlvRmlsZVJlYWRlckdTdHJlYW1lci5jcHA6CisgICAg
ICAgIChXZWJDb3JlOjpBdWRpb0ZpbGVSZWFkZXI6OmhhbmRsZVNhbXBsZSk6CisgICAgICAgIENh
bGN1bGF0ZSB0aGUgbnVtYmVyIG9mIHNhbXBsZXMgZnJvbSB0aGUgYWN0dWFsIGJ1ZmZlciBzaXpl
CisgICAgICAgIGFuZCB0aGUgYnl0ZXMtcGVyLWZyYW1lIGluc3RlYWQgb2YgdGhlIGJ1ZmZlciBk
dXJhdGlvbi4gVXNpbmcKKyAgICAgICAgdGhlIGJ1ZmZlciBkdXJhdGlvbiBjYW4gbGVhZCB0byBy
b3VuZGluZyBlcnJvcnMgYW5kIG1pZ2h0IGNhdXNlCisgICAgICAgIHRvbyBmZXcgc2FtcGxlcyB0
byBiZSBjb3BpZWQgb3ZlciBsYXRlci4KKworICAgICAgICAoV2ViQ29yZTo6QXVkaW9GaWxlUmVh
ZGVyOjpoYW5kbGVOZXdEZWludGVybGVhdmVQYWQpOgorICAgICAgICBTeW5jIHRoZSBzdGF0ZSBv
ZiB0aGUgcXVldWUgYW5kIHNpbmsgYWZ0ZXIgZGVpbnRlcmxlYXZlIHdpdGgKKyAgICAgICAgdGhl
IHBhcmVudCBzdGF0ZSBpbnN0ZWFkIG9mIGp1c3Qgc2V0dGluZyB0aGVtIHRvIFJFQURZLiBUaGF0
CisgICAgICAgIHdheSB3ZSBwb3RlbnRpYWxseSBnbyB0byBQQVVTRUQgc3RhdGUgYSBiaXQgZWFy
bGllciBhbHJlYWR5CisgICAgICAgIGFuZCBwcmV2ZW50IGEgcG90ZW50aWFsIHJhY2UgY29uZGl0
aW9uIHRoYXQgY291bGQgY2F1c2UgYnVmZmVycworICAgICAgICB0byBhcnJpdmUgaW4gdGhlIG5l
dyBlbGVtZW50cyBpbiBSRUFEWSBzdGF0ZSBhbHJlYWR5ICh3aGljaCB3b3VsZAorICAgICAgICBm
YWlsKS4KKworICAgICAgICAoV2ViQ29yZTo6QXVkaW9GaWxlUmVhZGVyOjpwbHVnRGVpbnRlcmxl
YXZlKToKKyAgICAgICAgSGFuZGxlIG11bHRpcGxlIGRlY29kZWJpbiBzb3VyY2UgcGFkcyBieSBp
Z25vcmluZyBhbGwgZm9sbG93aW5nCisgICAgICAgIG9uZXMganVzdCBpbiBjYXNlIHRoZXJlIGFy
ZSBtdWx0aXBsZSBmb3Igd2hhdGV2ZXIgcmVhc29uLgorCisgICAgICAgIChXZWJDb3JlOjpBdWRp
b0ZpbGVSZWFkZXI6OmRlY29kZUF1ZGlvRm9yQnVzQ3JlYXRpb24pOgorICAgICAgICBDYXRjaCBl
cnJvcnMgZnJvbSBnb2luZyB0byBQQVVTRUQgc3RhdGUgZWFybHkuIFdlIG1pZ2h0IG5vdAorICAg
ICAgICBnZXQgYSBlcnJvciBtZXNzYWdlIGF0IGFsbCBpZiB3ZSdyZSB1bmx1Y2t5LgorCisgICAg
ICAgIChXZWJDb3JlOjpBdWRpb0ZpbGVSZWFkZXI6OnBsdWdEZWludGVybGVhdmUpOgorICAgICAg
ICAoV2ViQ29yZTo6QXVkaW9GaWxlUmVhZGVyOjpjcmVhdGVCdXMpOgorICAgICAgICBEb3dubWl4
IHRvIG1vbm8gaWYgcmVxdWlyZWQgaW5zdGVhZCBvZiBqdXN0IHVzaW5nIHRoZSBmcm9udAorICAg
ICAgICBsZWZ0IGNoYW5uZWwgYW5kIGNsYWltaW5nIGl0IGlzIG1vbm8uIERvd25taXhpbmcgZnJv
bSBzdGVyZW8KKyAgICAgICAgdG8gbW9ubyB3aWxsIG1peCBib3RoIGNoYW5uZWxzIGluc3RlYWQg
b2YganVzdCB0YWtpbmcgdGhlIGxlZnQuCisKIDIwMTQtMTItMDcgIENhcmxvcyBHYXJjaWEgQ2Ft
cG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtdIE1pc3NpbmcgQVBJIGRl
dGVjdGVkIGluIEdPYmplY3QgRE9NIGJpbmRpbmdzIGFmdGVyIHIxNzY2MzAKZGlmZiAtLWdpdCBh
L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL2dzdHJlYW1lci9BdWRpb0ZpbGVSZWFkZXJH
U3RyZWFtZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vZ3N0cmVhbWVyL0F1
ZGlvRmlsZVJlYWRlckdTdHJlYW1lci5jcHAKaW5kZXggMDRiOGVhYmVjYTJkMGNlY2Y5OGIwZjQ5
MTViYTMxMTg4ODI0Y2NiNS4uZTI4ZjhjMjg0YmIzYjY1Y2E0MDA1MjgwMTA3ZTM2NmFhMDk5M2Vi
YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vZ3N0cmVhbWVyL0F1
ZGlvRmlsZVJlYWRlckdTdHJlYW1lci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v
YXVkaW8vZ3N0cmVhbWVyL0F1ZGlvRmlsZVJlYWRlckdTdHJlYW1lci5jcHAKQEAgLTU5LDYgKzU5
LDcgQEAgcHJpdmF0ZToKICAgICBjb25zdCBjaGFyKiBtX2ZpbGVQYXRoOwogCiAgICAgZmxvYXQg
bV9zYW1wbGVSYXRlOworICAgIGludCBtX2NoYW5uZWxzOwogICAgIEdzdEJ1ZmZlckxpc3QqIG1f
ZnJvbnRMZWZ0QnVmZmVyczsKICAgICBHc3RCdWZmZXJMaXN0KiBtX2Zyb250UmlnaHRCdWZmZXJz
OwogCkBAIC0xNzMsNyArMTc0LDcgQEAgR3N0Rmxvd1JldHVybiBBdWRpb0ZpbGVSZWFkZXI6Omhh
bmRsZVNhbXBsZShHc3RBcHBTaW5rKiBzaW5rKQogCiAgICAgR3N0QXVkaW9JbmZvIGluZm87CiAg
ICAgZ3N0X2F1ZGlvX2luZm9fZnJvbV9jYXBzKCZpbmZvLCBjYXBzKTsKLSAgICBpbnQgZnJhbWVz
ID0gR1NUX0NMT0NLX1RJTUVfVE9fRlJBTUVTKEdTVF9CVUZGRVJfRFVSQVRJT04oYnVmZmVyKSwg
R1NUX0FVRElPX0lORk9fUkFURSgmaW5mbykpOworICAgIGludCBmcmFtZXMgPSBnc3RfYnVmZmVy
X2dldF9zaXplKGJ1ZmZlcikgLyBpbmZvLmJwZjsKIAogICAgIC8vIENoZWNrIHRoZSBmaXJzdCBh
dWRpbyBjaGFubmVsLiBUaGUgYnVmZmVyIGlzIHN1cHBvc2VkIHRvIHN0b3JlCiAgICAgLy8gZGF0
YSBvZiBhIHNpbmdsZSBjaGFubmVsIGFueXdheS4KQEAgLTE5MSw3ICsxOTIsNiBAQCBHc3RGbG93
UmV0dXJuIEF1ZGlvRmlsZVJlYWRlcjo6aGFuZGxlU2FtcGxlKEdzdEFwcFNpbmsqIHNpbmspCiAK
ICAgICBnc3Rfc2FtcGxlX3VucmVmKHNhbXBsZSk7CiAgICAgcmV0dXJuIEdTVF9GTE9XX09LOwot
CiB9CiAKIGdib29sZWFuIEF1ZGlvRmlsZVJlYWRlcjo6aGFuZGxlTWVzc2FnZShHc3RNZXNzYWdl
KiBtZXNzYWdlKQpAQCAtMjQ0LDggKzI0NCw4IEBAIHZvaWQgQXVkaW9GaWxlUmVhZGVyOjpoYW5k
bGVOZXdEZWludGVybGVhdmVQYWQoR3N0UGFkKiBwYWQpCiAKICAgICBnc3RfZWxlbWVudF9saW5r
X3BhZHNfZnVsbChxdWV1ZSwgInNyYyIsIHNpbmssICJzaW5rIiwgR1NUX1BBRF9MSU5LX0NIRUNL
X05PVEhJTkcpOwogCi0gICAgZ3N0X2VsZW1lbnRfc2V0X3N0YXRlKHF1ZXVlLCBHU1RfU1RBVEVf
UkVBRFkpOwotICAgIGdzdF9lbGVtZW50X3NldF9zdGF0ZShzaW5rLCBHU1RfU1RBVEVfUkVBRFkp
OworICAgIGdzdF9lbGVtZW50X3N5bmNfc3RhdGVfd2l0aF9wYXJlbnQocXVldWUpOworICAgIGdz
dF9lbGVtZW50X3N5bmNfc3RhdGVfd2l0aF9wYXJlbnQoc2luayk7CiB9CiAKIHZvaWQgQXVkaW9G
aWxlUmVhZGVyOjpkZWludGVybGVhdmVQYWRzQ29uZmlndXJlZCgpCkBAIC0yNTcsNiArMjU3LDEw
IEBAIHZvaWQgQXVkaW9GaWxlUmVhZGVyOjpkZWludGVybGVhdmVQYWRzQ29uZmlndXJlZCgpCiAK
IHZvaWQgQXVkaW9GaWxlUmVhZGVyOjpwbHVnRGVpbnRlcmxlYXZlKEdzdFBhZCogcGFkKQogewor
ICAgIC8vIElnbm9yZSBhbnkgYWRkaXRpb25hbCBzb3VyY2UgcGFkcyBqdXN0IGluIGNhc2UKKyAg
ICBpZiAobV9kZUludGVybGVhdmUpCisgICAgICAgIHJldHVybjsKKwogICAgIC8vIEEgZGVjb2Rl
YmluIHBhZCB3YXMgYWRkZWQsIHBsdWcgaW4gYSBkZWludGVybGVhdmUgZWxlbWVudCB0bwogICAg
IC8vIHNlcGFyYXRlIGVhY2ggcGxhbmFyIGNoYW5uZWwuIFN1YiBwaXBlbGluZSBsb29rcyBsaWtl
CiAgICAgLy8gLi4uIGRlY29kZWJpbjIgISBhdWRpb2NvbnZlcnQgISBhdWRpb3Jlc2FtcGxlICEg
Y2Fwc2ZpbHRlciAhIGRlaW50ZXJsZWF2ZS4KQEAgLTI2OSw5ICsyNzMsMTAgQEAgdm9pZCBBdWRp
b0ZpbGVSZWFkZXI6OnBsdWdEZWludGVybGVhdmUoR3N0UGFkKiBwYWQpCiAgICAgZ19zaWduYWxf
Y29ubmVjdChtX2RlSW50ZXJsZWF2ZS5nZXQoKSwgInBhZC1hZGRlZCIsIEdfQ0FMTEJBQ0sob25H
U3RyZWFtZXJEZWludGVybGVhdmVQYWRBZGRlZENhbGxiYWNrKSwgdGhpcyk7CiAgICAgZ19zaWdu
YWxfY29ubmVjdChtX2RlSW50ZXJsZWF2ZS5nZXQoKSwgIm5vLW1vcmUtcGFkcyIsIEdfQ0FMTEJB
Q0sob25HU3RyZWFtZXJEZWludGVybGVhdmVSZWFkeUNhbGxiYWNrKSwgdGhpcyk7CiAKLSAgICBH
c3RDYXBzKiBjYXBzID0gZ3N0X2NhcHNfbmV3X3NpbXBsZSgiYXVkaW8veC1yYXciLCAicmF0ZSIs
IEdfVFlQRV9JTlQsIHN0YXRpY19jYXN0PGludD4obV9zYW1wbGVSYXRlKSwKLSAgICAgICAgImNo
YW5uZWxzIiwgR19UWVBFX0lOVCwgMiwKLSAgICAgICAgImZvcm1hdCIsIEdfVFlQRV9TVFJJTkcs
IGdzdF9hdWRpb19mb3JtYXRfdG9fc3RyaW5nKEdTVF9BVURJT19GT1JNQVRfRjMyKSwKKyAgICBH
c3RDYXBzKiBjYXBzID0gZ3N0X2NhcHNfbmV3X3NpbXBsZSgiYXVkaW8veC1yYXciLAorICAgICAg
ICAicmF0ZSIsIEdfVFlQRV9JTlQsIHN0YXRpY19jYXN0PGludD4obV9zYW1wbGVSYXRlKSwKKyAg
ICAgICAgImNoYW5uZWxzIiwgR19UWVBFX0lOVCwgbV9jaGFubmVscywKKyAgICAgICAgImZvcm1h
dCIsIEdfVFlQRV9TVFJJTkcsIEdTVF9BVURJT19ORShGMzIpLAogICAgICAgICAibGF5b3V0Iiwg
R19UWVBFX1NUUklORywgImludGVybGVhdmVkIiwgbnVsbHB0cik7CiAgICAgZ19vYmplY3Rfc2V0
KGNhcHNGaWx0ZXIsICJjYXBzIiwgY2FwcywgTlVMTCk7CiAgICAgZ3N0X2NhcHNfdW5yZWYoY2Fw
cyk7CkBAIC0zMTksMTIgKzMyNCwyMCBAQCB2b2lkIEF1ZGlvRmlsZVJlYWRlcjo6ZGVjb2RlQXVk
aW9Gb3JCdXNDcmVhdGlvbigpCiAKICAgICBnc3RfYmluX2FkZF9tYW55KEdTVF9CSU4obV9waXBl
bGluZSksIHNvdXJjZSwgbV9kZWNvZGViaW4uZ2V0KCksIE5VTEwpOwogICAgIGdzdF9lbGVtZW50
X2xpbmtfcGFkc19mdWxsKHNvdXJjZSwgInNyYyIsIG1fZGVjb2RlYmluLmdldCgpLCAic2luayIs
IEdTVF9QQURfTElOS19DSEVDS19OT1RISU5HKTsKLSAgICBnc3RfZWxlbWVudF9zZXRfc3RhdGUo
bV9waXBlbGluZSwgR1NUX1NUQVRFX1BBVVNFRCk7CisKKyAgICAvLyBDYXRjaCBlcnJvcnMgaGVy
ZSBpbW1lZGlhdGVseSwgdGhlcmUgbWlnaHQgbm90IGJlIGFuIGVycm9yIG1lc3NhZ2UgaWYKKyAg
ICAvLyB3ZSdyZSB1bmx1Y2t5CisgICAgaWYgKGdzdF9lbGVtZW50X3NldF9zdGF0ZShtX3BpcGVs
aW5lLCBHU1RfU1RBVEVfUEFVU0VEKSA9PSBHU1RfU1RBVEVfQ0hBTkdFX0ZBSUxVUkUpIHsKKyAg
ICAgICAgZ193YXJuaW5nKCJFcnJvcjogRmFpbGVkIHRvIHNldCBwaXBlbGluZSB0byBQQVVTRUQi
KTsKKyAgICAgICAgbV9lcnJvck9jY3VycmVkID0gdHJ1ZTsKKyAgICAgICAgZ19tYWluX2xvb3Bf
cXVpdChtX2xvb3AuZ2V0KCkpOworICAgIH0KIH0KIAogUGFzc1JlZlB0cjxBdWRpb0J1cz4gQXVk
aW9GaWxlUmVhZGVyOjpjcmVhdGVCdXMoZmxvYXQgc2FtcGxlUmF0ZSwgYm9vbCBtaXhUb01vbm8p
CiB7CiAgICAgbV9zYW1wbGVSYXRlID0gc2FtcGxlUmF0ZTsKKyAgICBtX2NoYW5uZWxzID0gbWl4
VG9Nb25vID8gMSA6IDI7CiAKICAgICBtX2Zyb250TGVmdEJ1ZmZlcnMgPSBnc3RfYnVmZmVyX2xp
c3RfbmV3KCk7CiAgICAgbV9mcm9udFJpZ2h0QnVmZmVycyA9IGdzdF9idWZmZXJfbGlzdF9uZXco
KTsKQEAgLTM0MCwxMSArMzUzLDE0IEBAIFBhc3NSZWZQdHI8QXVkaW9CdXM+IEF1ZGlvRmlsZVJl
YWRlcjo6Y3JlYXRlQnVzKGZsb2F0IHNhbXBsZVJhdGUsIGJvb2wgbWl4VG9Nb25vCiAgICAgZ19t
YWluX2xvb3BfcnVuKG1fbG9vcC5nZXQoKSk7CiAgICAgZ19tYWluX2NvbnRleHRfcG9wX3RocmVh
ZF9kZWZhdWx0KGNvbnRleHQuZ2V0KCkpOwogCisgICAgLy8gU2V0IHBpcGVsaW5lIHRvIEdTVF9T
VEFURV9OVUxMIHN0YXRlIGhlcmUgYWxyZWFkeSBBU0FQIHRvCisgICAgLy8gcmVsZWFzZSBhbnkg
cmVzb3VyY2VzIHRoYXQgbWlnaHQgc3RpbGwgYmUgdXNlZAorICAgIGdzdF9lbGVtZW50X3NldF9z
dGF0ZShtX3BpcGVsaW5lLCBHU1RfU1RBVEVfTlVMTCk7CisKICAgICBpZiAobV9lcnJvck9jY3Vy
cmVkKQogICAgICAgICByZXR1cm4gMDsKIAotICAgIHVuc2lnbmVkIGNoYW5uZWxzID0gbWl4VG9N
b25vID8gMSA6IDI7Ci0gICAgUmVmUHRyPEF1ZGlvQnVzPiBhdWRpb0J1cyA9IEF1ZGlvQnVzOjpj
cmVhdGUoY2hhbm5lbHMsIG1fY2hhbm5lbFNpemUsIHRydWUpOworICAgIFJlZlB0cjxBdWRpb0J1
cz4gYXVkaW9CdXMgPSBBdWRpb0J1czo6Y3JlYXRlKG1fY2hhbm5lbHMsIG1fY2hhbm5lbFNpemUs
IHRydWUpOwogICAgIGF1ZGlvQnVzLT5zZXRTYW1wbGVSYXRlKG1fc2FtcGxlUmF0ZSk7CiAKICAg
ICBjb3B5R3N0cmVhbWVyQnVmZmVyc1RvQXVkaW9DaGFubmVsKG1fZnJvbnRMZWZ0QnVmZmVycywg
YXVkaW9CdXMtPmNoYW5uZWwoMCkpOwo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>242747</attachid>
            <date>2014-12-07 08:35:21 -0800</date>
            <delta_ts>2014-12-07 08:44:32 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-139367-20141207173644.patch</filename>
            <type>text/plain</type>
            <size>7485</size>
            <attacher name="Sebastian Dröge (slomo)">slomo</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2OTE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODMzOWQ3Y2ViOTVjMDRh
ZmMwNTVhMzFkNDY0ZjA3NTFjOGM2ZTk0MC4uOGVmZmVmOWJmYzk3OGNlOTJhOGU4YWE5ZDZjZjYw
ZDNlM2JlZmM4NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ0IEBACisyMDE0LTEyLTA3ICBTZWJh
c3RpYW4gRHLDtmdlICA8c2ViYXN0aWFuQGNlbnRyaWN1bGFyLmNvbT4KKworICAgICAgICBbR1N0
cmVhbWVyXSBNaW5vciBjbGVhbnVwIG9mIHRoZSBBdWRpb0ZpbGVSZWFkZXIgaW1wbGVtZW50YXRp
b24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzOTM2
NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxh
dGZvcm0vYXVkaW8vZ3N0cmVhbWVyL0F1ZGlvRmlsZVJlYWRlckdTdHJlYW1lci5jcHA6CisgICAg
ICAgIChXZWJDb3JlOjpBdWRpb0ZpbGVSZWFkZXI6On5BdWRpb0ZpbGVSZWFkZXIpOgorICAgICAg
ICBEb24ndCBjYWxsIGdzdF9idXNfcmVtb3ZlX3NpZ25hbF93YXRjaCgpLCB0aGUgc291cmNlIHdh
cyBhbHJlYWR5CisgICAgICAgIGRlc3Ryb3llZCB0b2dldGhlciB3aXRoIHRoZSBtYWluIGNvbnRl
eHQgYW5kIGRvaW5nIGl0IGFnYWluIGhlcmUKKyAgICAgICAgd2lsbCBnaXZlIGEgZ19jcml0aWNh
bCgpLgorCisgICAgICAgIChXZWJDb3JlOjpBdWRpb0ZpbGVSZWFkZXI6OmhhbmRsZVNhbXBsZSk6
CisgICAgICAgIENhbGN1bGF0ZSB0aGUgbnVtYmVyIG9mIHNhbXBsZXMgZnJvbSB0aGUgYWN0dWFs
IGJ1ZmZlciBzaXplCisgICAgICAgIGFuZCB0aGUgYnl0ZXMtcGVyLWZyYW1lIGluc3RlYWQgb2Yg
dGhlIGJ1ZmZlciBkdXJhdGlvbi4gVXNpbmcKKyAgICAgICAgdGhlIGJ1ZmZlciBkdXJhdGlvbiBj
YW4gbGVhZCB0byByb3VuZGluZyBlcnJvcnMgYW5kIG1pZ2h0IGNhdXNlCisgICAgICAgIHRvbyBm
ZXcgc2FtcGxlcyB0byBiZSBjb3BpZWQgb3ZlciBsYXRlci4KKworICAgICAgICAoV2ViQ29yZTo6
QXVkaW9GaWxlUmVhZGVyOjpoYW5kbGVOZXdEZWludGVybGVhdmVQYWQpOgorICAgICAgICBTeW5j
IHRoZSBzdGF0ZSBvZiB0aGUgcXVldWUgYW5kIHNpbmsgYWZ0ZXIgZGVpbnRlcmxlYXZlIHdpdGgK
KyAgICAgICAgdGhlIHBhcmVudCBzdGF0ZSBpbnN0ZWFkIG9mIGp1c3Qgc2V0dGluZyB0aGVtIHRv
IFJFQURZLiBUaGF0CisgICAgICAgIHdheSB3ZSBwb3RlbnRpYWxseSBnbyB0byBQQVVTRUQgc3Rh
dGUgYSBiaXQgZWFybGllciBhbHJlYWR5CisgICAgICAgIGFuZCBwcmV2ZW50IGEgcG90ZW50aWFs
IHJhY2UgY29uZGl0aW9uIHRoYXQgY291bGQgY2F1c2UgYnVmZmVycworICAgICAgICB0byBhcnJp
dmUgaW4gdGhlIG5ldyBlbGVtZW50cyBpbiBSRUFEWSBzdGF0ZSBhbHJlYWR5ICh3aGljaCB3b3Vs
ZAorICAgICAgICBmYWlsKS4KKworICAgICAgICAoV2ViQ29yZTo6QXVkaW9GaWxlUmVhZGVyOjpw
bHVnRGVpbnRlcmxlYXZlKToKKyAgICAgICAgSGFuZGxlIG11bHRpcGxlIGRlY29kZWJpbiBzb3Vy
Y2UgcGFkcyBieSBpZ25vcmluZyBhbGwgZm9sbG93aW5nCisgICAgICAgIG9uZXMganVzdCBpbiBj
YXNlIHRoZXJlIGFyZSBtdWx0aXBsZSBmb3Igd2hhdGV2ZXIgcmVhc29uLgorCisgICAgICAgIChX
ZWJDb3JlOjpBdWRpb0ZpbGVSZWFkZXI6OmRlY29kZUF1ZGlvRm9yQnVzQ3JlYXRpb24pOgorICAg
ICAgICBDYXRjaCBlcnJvcnMgZnJvbSBnb2luZyB0byBQQVVTRUQgc3RhdGUgZWFybHkuIFdlIG1p
Z2h0IG5vdAorICAgICAgICBnZXQgYSBlcnJvciBtZXNzYWdlIGF0IGFsbCBpZiB3ZSdyZSB1bmx1
Y2t5LgorCisgICAgICAgIChXZWJDb3JlOjpBdWRpb0ZpbGVSZWFkZXI6OnBsdWdEZWludGVybGVh
dmUpOgorICAgICAgICAoV2ViQ29yZTo6QXVkaW9GaWxlUmVhZGVyOjpjcmVhdGVCdXMpOgorICAg
ICAgICBEb3dubWl4IHRvIG1vbm8gaWYgcmVxdWlyZWQgaW5zdGVhZCBvZiBqdXN0IHVzaW5nIHRo
ZSBmcm9udAorICAgICAgICBsZWZ0IGNoYW5uZWwgYW5kIGNsYWltaW5nIGl0IGlzIG1vbm8uIERv
d25taXhpbmcgZnJvbSBzdGVyZW8KKyAgICAgICAgdG8gbW9ubyB3aWxsIG1peCBib3RoIGNoYW5u
ZWxzIGluc3RlYWQgb2YganVzdCB0YWtpbmcgdGhlIGxlZnQuCisKIDIwMTQtMTItMDcgIENhcmxv
cyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtdIE1p
c3NpbmcgQVBJIGRldGVjdGVkIGluIEdPYmplY3QgRE9NIGJpbmRpbmdzIGFmdGVyIHIxNzY2MzAK
ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL2dzdHJlYW1lci9BdWRp
b0ZpbGVSZWFkZXJHU3RyZWFtZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8v
Z3N0cmVhbWVyL0F1ZGlvRmlsZVJlYWRlckdTdHJlYW1lci5jcHAKaW5kZXggMDRiOGVhYmVjYTJk
MGNlY2Y5OGIwZjQ5MTViYTMxMTg4ODI0Y2NiNS4uNmViZTg1NTlkODI2ZjM1NjJmNWZjZDQ3ZTMx
MmI1ZDk4NmRkZWZjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8v
Z3N0cmVhbWVyL0F1ZGlvRmlsZVJlYWRlckdTdHJlYW1lci5jcHAKKysrIGIvU291cmNlL1dlYkNv
cmUvcGxhdGZvcm0vYXVkaW8vZ3N0cmVhbWVyL0F1ZGlvRmlsZVJlYWRlckdTdHJlYW1lci5jcHAK
QEAgLTU5LDYgKzU5LDcgQEAgcHJpdmF0ZToKICAgICBjb25zdCBjaGFyKiBtX2ZpbGVQYXRoOwog
CiAgICAgZmxvYXQgbV9zYW1wbGVSYXRlOworICAgIGludCBtX2NoYW5uZWxzOwogICAgIEdzdEJ1
ZmZlckxpc3QqIG1fZnJvbnRMZWZ0QnVmZmVyczsKICAgICBHc3RCdWZmZXJMaXN0KiBtX2Zyb250
UmlnaHRCdWZmZXJzOwogCkBAIC0xMzIsNyArMTMzLDYgQEAgQXVkaW9GaWxlUmVhZGVyOjp+QXVk
aW9GaWxlUmVhZGVyKCkKICAgICAgICAgR1JlZlB0cjxHc3RCdXM+IGJ1cyA9IGFkb3B0R1JlZihn
c3RfcGlwZWxpbmVfZ2V0X2J1cyhHU1RfUElQRUxJTkUobV9waXBlbGluZSkpKTsKICAgICAgICAg
QVNTRVJUKGJ1cyk7CiAgICAgICAgIGdfc2lnbmFsX2hhbmRsZXJzX2Rpc2Nvbm5lY3RfYnlfZnVu
YyhidXMuZ2V0KCksIHJlaW50ZXJwcmV0X2Nhc3Q8Z3BvaW50ZXI+KG1lc3NhZ2VDYWxsYmFjayks
IHRoaXMpOwotICAgICAgICBnc3RfYnVzX3JlbW92ZV9zaWduYWxfd2F0Y2goYnVzLmdldCgpKTsK
IAogICAgICAgICBnc3RfZWxlbWVudF9zZXRfc3RhdGUobV9waXBlbGluZSwgR1NUX1NUQVRFX05V
TEwpOwogICAgICAgICBnc3Rfb2JqZWN0X3VucmVmKEdTVF9PQkpFQ1QobV9waXBlbGluZSkpOwpA
QCAtMTczLDcgKzE3Myw3IEBAIEdzdEZsb3dSZXR1cm4gQXVkaW9GaWxlUmVhZGVyOjpoYW5kbGVT
YW1wbGUoR3N0QXBwU2luayogc2luaykKIAogICAgIEdzdEF1ZGlvSW5mbyBpbmZvOwogICAgIGdz
dF9hdWRpb19pbmZvX2Zyb21fY2FwcygmaW5mbywgY2Fwcyk7Ci0gICAgaW50IGZyYW1lcyA9IEdT
VF9DTE9DS19USU1FX1RPX0ZSQU1FUyhHU1RfQlVGRkVSX0RVUkFUSU9OKGJ1ZmZlciksIEdTVF9B
VURJT19JTkZPX1JBVEUoJmluZm8pKTsKKyAgICBpbnQgZnJhbWVzID0gZ3N0X2J1ZmZlcl9nZXRf
c2l6ZShidWZmZXIpIC8gaW5mby5icGY7CiAKICAgICAvLyBDaGVjayB0aGUgZmlyc3QgYXVkaW8g
Y2hhbm5lbC4gVGhlIGJ1ZmZlciBpcyBzdXBwb3NlZCB0byBzdG9yZQogICAgIC8vIGRhdGEgb2Yg
YSBzaW5nbGUgY2hhbm5lbCBhbnl3YXkuCkBAIC0xOTEsNyArMTkxLDYgQEAgR3N0Rmxvd1JldHVy
biBBdWRpb0ZpbGVSZWFkZXI6OmhhbmRsZVNhbXBsZShHc3RBcHBTaW5rKiBzaW5rKQogCiAgICAg
Z3N0X3NhbXBsZV91bnJlZihzYW1wbGUpOwogICAgIHJldHVybiBHU1RfRkxPV19PSzsKLQogfQog
CiBnYm9vbGVhbiBBdWRpb0ZpbGVSZWFkZXI6OmhhbmRsZU1lc3NhZ2UoR3N0TWVzc2FnZSogbWVz
c2FnZSkKQEAgLTI0NCw4ICsyNDMsOCBAQCB2b2lkIEF1ZGlvRmlsZVJlYWRlcjo6aGFuZGxlTmV3
RGVpbnRlcmxlYXZlUGFkKEdzdFBhZCogcGFkKQogCiAgICAgZ3N0X2VsZW1lbnRfbGlua19wYWRz
X2Z1bGwocXVldWUsICJzcmMiLCBzaW5rLCAic2luayIsIEdTVF9QQURfTElOS19DSEVDS19OT1RI
SU5HKTsKIAotICAgIGdzdF9lbGVtZW50X3NldF9zdGF0ZShxdWV1ZSwgR1NUX1NUQVRFX1JFQURZ
KTsKLSAgICBnc3RfZWxlbWVudF9zZXRfc3RhdGUoc2luaywgR1NUX1NUQVRFX1JFQURZKTsKKyAg
ICBnc3RfZWxlbWVudF9zeW5jX3N0YXRlX3dpdGhfcGFyZW50KHF1ZXVlKTsKKyAgICBnc3RfZWxl
bWVudF9zeW5jX3N0YXRlX3dpdGhfcGFyZW50KHNpbmspOwogfQogCiB2b2lkIEF1ZGlvRmlsZVJl
YWRlcjo6ZGVpbnRlcmxlYXZlUGFkc0NvbmZpZ3VyZWQoKQpAQCAtMjU3LDYgKzI1NiwxMCBAQCB2
b2lkIEF1ZGlvRmlsZVJlYWRlcjo6ZGVpbnRlcmxlYXZlUGFkc0NvbmZpZ3VyZWQoKQogCiB2b2lk
IEF1ZGlvRmlsZVJlYWRlcjo6cGx1Z0RlaW50ZXJsZWF2ZShHc3RQYWQqIHBhZCkKIHsKKyAgICAv
LyBJZ25vcmUgYW55IGFkZGl0aW9uYWwgc291cmNlIHBhZHMganVzdCBpbiBjYXNlCisgICAgaWYg
KG1fZGVJbnRlcmxlYXZlKQorICAgICAgICByZXR1cm47CisKICAgICAvLyBBIGRlY29kZWJpbiBw
YWQgd2FzIGFkZGVkLCBwbHVnIGluIGEgZGVpbnRlcmxlYXZlIGVsZW1lbnQgdG8KICAgICAvLyBz
ZXBhcmF0ZSBlYWNoIHBsYW5hciBjaGFubmVsLiBTdWIgcGlwZWxpbmUgbG9va3MgbGlrZQogICAg
IC8vIC4uLiBkZWNvZGViaW4yICEgYXVkaW9jb252ZXJ0ICEgYXVkaW9yZXNhbXBsZSAhIGNhcHNm
aWx0ZXIgISBkZWludGVybGVhdmUuCkBAIC0yNjksOSArMjcyLDEwIEBAIHZvaWQgQXVkaW9GaWxl
UmVhZGVyOjpwbHVnRGVpbnRlcmxlYXZlKEdzdFBhZCogcGFkKQogICAgIGdfc2lnbmFsX2Nvbm5l
Y3QobV9kZUludGVybGVhdmUuZ2V0KCksICJwYWQtYWRkZWQiLCBHX0NBTExCQUNLKG9uR1N0cmVh
bWVyRGVpbnRlcmxlYXZlUGFkQWRkZWRDYWxsYmFjayksIHRoaXMpOwogICAgIGdfc2lnbmFsX2Nv
bm5lY3QobV9kZUludGVybGVhdmUuZ2V0KCksICJuby1tb3JlLXBhZHMiLCBHX0NBTExCQUNLKG9u
R1N0cmVhbWVyRGVpbnRlcmxlYXZlUmVhZHlDYWxsYmFjayksIHRoaXMpOwogCi0gICAgR3N0Q2Fw
cyogY2FwcyA9IGdzdF9jYXBzX25ld19zaW1wbGUoImF1ZGlvL3gtcmF3IiwgInJhdGUiLCBHX1RZ
UEVfSU5ULCBzdGF0aWNfY2FzdDxpbnQ+KG1fc2FtcGxlUmF0ZSksCi0gICAgICAgICJjaGFubmVs
cyIsIEdfVFlQRV9JTlQsIDIsCi0gICAgICAgICJmb3JtYXQiLCBHX1RZUEVfU1RSSU5HLCBnc3Rf
YXVkaW9fZm9ybWF0X3RvX3N0cmluZyhHU1RfQVVESU9fRk9STUFUX0YzMiksCisgICAgR3N0Q2Fw
cyogY2FwcyA9IGdzdF9jYXBzX25ld19zaW1wbGUoImF1ZGlvL3gtcmF3IiwKKyAgICAgICAgInJh
dGUiLCBHX1RZUEVfSU5ULCBzdGF0aWNfY2FzdDxpbnQ+KG1fc2FtcGxlUmF0ZSksCisgICAgICAg
ICJjaGFubmVscyIsIEdfVFlQRV9JTlQsIG1fY2hhbm5lbHMsCisgICAgICAgICJmb3JtYXQiLCBH
X1RZUEVfU1RSSU5HLCBHU1RfQVVESU9fTkUoRjMyKSwKICAgICAgICAgImxheW91dCIsIEdfVFlQ
RV9TVFJJTkcsICJpbnRlcmxlYXZlZCIsIG51bGxwdHIpOwogICAgIGdfb2JqZWN0X3NldChjYXBz
RmlsdGVyLCAiY2FwcyIsIGNhcHMsIE5VTEwpOwogICAgIGdzdF9jYXBzX3VucmVmKGNhcHMpOwpA
QCAtMzE5LDEyICszMjMsMjAgQEAgdm9pZCBBdWRpb0ZpbGVSZWFkZXI6OmRlY29kZUF1ZGlvRm9y
QnVzQ3JlYXRpb24oKQogCiAgICAgZ3N0X2Jpbl9hZGRfbWFueShHU1RfQklOKG1fcGlwZWxpbmUp
LCBzb3VyY2UsIG1fZGVjb2RlYmluLmdldCgpLCBOVUxMKTsKICAgICBnc3RfZWxlbWVudF9saW5r
X3BhZHNfZnVsbChzb3VyY2UsICJzcmMiLCBtX2RlY29kZWJpbi5nZXQoKSwgInNpbmsiLCBHU1Rf
UEFEX0xJTktfQ0hFQ0tfTk9USElORyk7Ci0gICAgZ3N0X2VsZW1lbnRfc2V0X3N0YXRlKG1fcGlw
ZWxpbmUsIEdTVF9TVEFURV9QQVVTRUQpOworCisgICAgLy8gQ2F0Y2ggZXJyb3JzIGhlcmUgaW1t
ZWRpYXRlbHksIHRoZXJlIG1pZ2h0IG5vdCBiZSBhbiBlcnJvciBtZXNzYWdlIGlmCisgICAgLy8g
d2UncmUgdW5sdWNreQorICAgIGlmIChnc3RfZWxlbWVudF9zZXRfc3RhdGUobV9waXBlbGluZSwg
R1NUX1NUQVRFX1BBVVNFRCkgPT0gR1NUX1NUQVRFX0NIQU5HRV9GQUlMVVJFKSB7CisgICAgICAg
IGdfd2FybmluZygiRXJyb3I6IEZhaWxlZCB0byBzZXQgcGlwZWxpbmUgdG8gUEFVU0VEIik7Cisg
ICAgICAgIG1fZXJyb3JPY2N1cnJlZCA9IHRydWU7CisgICAgICAgIGdfbWFpbl9sb29wX3F1aXQo
bV9sb29wLmdldCgpKTsKKyAgICB9CiB9CiAKIFBhc3NSZWZQdHI8QXVkaW9CdXM+IEF1ZGlvRmls
ZVJlYWRlcjo6Y3JlYXRlQnVzKGZsb2F0IHNhbXBsZVJhdGUsIGJvb2wgbWl4VG9Nb25vKQogewog
ICAgIG1fc2FtcGxlUmF0ZSA9IHNhbXBsZVJhdGU7CisgICAgbV9jaGFubmVscyA9IG1peFRvTW9u
byA/IDEgOiAyOwogCiAgICAgbV9mcm9udExlZnRCdWZmZXJzID0gZ3N0X2J1ZmZlcl9saXN0X25l
dygpOwogICAgIG1fZnJvbnRSaWdodEJ1ZmZlcnMgPSBnc3RfYnVmZmVyX2xpc3RfbmV3KCk7CkBA
IC0zNDAsMTEgKzM1MiwxNCBAQCBQYXNzUmVmUHRyPEF1ZGlvQnVzPiBBdWRpb0ZpbGVSZWFkZXI6
OmNyZWF0ZUJ1cyhmbG9hdCBzYW1wbGVSYXRlLCBib29sIG1peFRvTW9ubwogICAgIGdfbWFpbl9s
b29wX3J1bihtX2xvb3AuZ2V0KCkpOwogICAgIGdfbWFpbl9jb250ZXh0X3BvcF90aHJlYWRfZGVm
YXVsdChjb250ZXh0LmdldCgpKTsKIAorICAgIC8vIFNldCBwaXBlbGluZSB0byBHU1RfU1RBVEVf
TlVMTCBzdGF0ZSBoZXJlIGFscmVhZHkgQVNBUCB0bworICAgIC8vIHJlbGVhc2UgYW55IHJlc291
cmNlcyB0aGF0IG1pZ2h0IHN0aWxsIGJlIHVzZWQKKyAgICBnc3RfZWxlbWVudF9zZXRfc3RhdGUo
bV9waXBlbGluZSwgR1NUX1NUQVRFX05VTEwpOworCiAgICAgaWYgKG1fZXJyb3JPY2N1cnJlZCkK
ICAgICAgICAgcmV0dXJuIDA7CiAKLSAgICB1bnNpZ25lZCBjaGFubmVscyA9IG1peFRvTW9ubyA/
IDEgOiAyOwotICAgIFJlZlB0cjxBdWRpb0J1cz4gYXVkaW9CdXMgPSBBdWRpb0J1czo6Y3JlYXRl
KGNoYW5uZWxzLCBtX2NoYW5uZWxTaXplLCB0cnVlKTsKKyAgICBSZWZQdHI8QXVkaW9CdXM+IGF1
ZGlvQnVzID0gQXVkaW9CdXM6OmNyZWF0ZShtX2NoYW5uZWxzLCBtX2NoYW5uZWxTaXplLCB0cnVl
KTsKICAgICBhdWRpb0J1cy0+c2V0U2FtcGxlUmF0ZShtX3NhbXBsZVJhdGUpOwogCiAgICAgY29w
eUdzdHJlYW1lckJ1ZmZlcnNUb0F1ZGlvQ2hhbm5lbChtX2Zyb250TGVmdEJ1ZmZlcnMsIGF1ZGlv
QnVzLT5jaGFubmVsKDApKTsK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>242749</attachid>
            <date>2014-12-07 08:44:38 -0800</date>
            <delta_ts>2014-12-07 09:10:43 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-139367-20141207174601.patch</filename>
            <type>text/plain</type>
            <size>8182</size>
            <attacher name="Sebastian Dröge (slomo)">slomo</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2OTE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODMzOWQ3Y2ViOTVjMDRh
ZmMwNTVhMzFkNDY0ZjA3NTFjOGM2ZTk0MC4uOTA4ZmVhZGM2OTFlOTI4YTM1Yzc0ZWFmODhiZjZm
YzlhZTMzMjM3ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ5IEBACisyMDE0LTEyLTA3ICBTZWJh
c3RpYW4gRHLDtmdlICA8c2ViYXN0aWFuQGNlbnRyaWN1bGFyLmNvbT4KKworICAgICAgICBbR1N0
cmVhbWVyXSBNaW5vciBjbGVhbnVwIG9mIHRoZSBBdWRpb0ZpbGVSZWFkZXIgaW1wbGVtZW50YXRp
b24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzOTM2
NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxh
dGZvcm0vYXVkaW8vZ3N0cmVhbWVyL0F1ZGlvRmlsZVJlYWRlckdTdHJlYW1lci5jcHA6CisgICAg
ICAgIChXZWJDb3JlOjpBdWRpb0ZpbGVSZWFkZXI6On5BdWRpb0ZpbGVSZWFkZXIpOgorICAgICAg
ICBEb24ndCBjYWxsIGdzdF9idXNfcmVtb3ZlX3NpZ25hbF93YXRjaCgpLCB0aGUgc291cmNlIHdh
cyBhbHJlYWR5CisgICAgICAgIGRlc3Ryb3llZCB0b2dldGhlciB3aXRoIHRoZSBtYWluIGNvbnRl
eHQgYW5kIGRvaW5nIGl0IGFnYWluIGhlcmUKKyAgICAgICAgd2lsbCBnaXZlIGEgZ19jcml0aWNh
bCgpLgorCisgICAgICAgIChXZWJDb3JlOjpBdWRpb0ZpbGVSZWFkZXI6OmhhbmRsZVNhbXBsZSk6
CisgICAgICAgIENhbGN1bGF0ZSB0aGUgbnVtYmVyIG9mIHNhbXBsZXMgZnJvbSB0aGUgYWN0dWFs
IGJ1ZmZlciBzaXplCisgICAgICAgIGFuZCB0aGUgYnl0ZXMtcGVyLWZyYW1lIGluc3RlYWQgb2Yg
dGhlIGJ1ZmZlciBkdXJhdGlvbi4gVXNpbmcKKyAgICAgICAgdGhlIGJ1ZmZlciBkdXJhdGlvbiBj
YW4gbGVhZCB0byByb3VuZGluZyBlcnJvcnMgYW5kIG1pZ2h0IGNhdXNlCisgICAgICAgIHRvbyBm
ZXcgc2FtcGxlcyB0byBiZSBjb3BpZWQgb3ZlciBsYXRlci4KKworICAgICAgICAoV2ViQ29yZTo6
QXVkaW9GaWxlUmVhZGVyOjpoYW5kbGVNZXNzYWdlKToKKyAgICAgICAgU2V0IHRoZSBwaXBlbGlu
ZSB0byBHU1RfU1RBVEVfTlVMTCBpbW1lZGlhdGVseSB3aGVuIHJlY2VpdmluZworICAgICAgICBl
cnJvcnMgdG8gcHJldmVudCBvdGhlciBmb2xsb3ctdXAgZXJyb3IgbWVzc2FnZXMgZnJvbSBwcm9w
YWdhdGluZworICAgICAgICB0aHJvdWdoIHRoZSBidXMgYW5kIHNwYW1taW5nIHRoZSB1c2VyJ3Mg
dGVybWluYWwgd2l0aCBnX3dhcm5pbmdzKCkuCisKKyAgICAgICAgKFdlYkNvcmU6OkF1ZGlvRmls
ZVJlYWRlcjo6aGFuZGxlTmV3RGVpbnRlcmxlYXZlUGFkKToKKyAgICAgICAgU3luYyB0aGUgc3Rh
dGUgb2YgdGhlIHF1ZXVlIGFuZCBzaW5rIGFmdGVyIGRlaW50ZXJsZWF2ZSB3aXRoCisgICAgICAg
IHRoZSBwYXJlbnQgc3RhdGUgaW5zdGVhZCBvZiBqdXN0IHNldHRpbmcgdGhlbSB0byBSRUFEWS4g
VGhhdAorICAgICAgICB3YXkgd2UgcG90ZW50aWFsbHkgZ28gdG8gUEFVU0VEIHN0YXRlIGEgYml0
IGVhcmxpZXIgYWxyZWFkeQorICAgICAgICBhbmQgcHJldmVudCBhIHBvdGVudGlhbCByYWNlIGNv
bmRpdGlvbiB0aGF0IGNvdWxkIGNhdXNlIGJ1ZmZlcnMKKyAgICAgICAgdG8gYXJyaXZlIGluIHRo
ZSBuZXcgZWxlbWVudHMgaW4gUkVBRFkgc3RhdGUgYWxyZWFkeSAod2hpY2ggd291bGQKKyAgICAg
ICAgZmFpbCkuCisKKyAgICAgICAgKFdlYkNvcmU6OkF1ZGlvRmlsZVJlYWRlcjo6cGx1Z0RlaW50
ZXJsZWF2ZSk6CisgICAgICAgIEhhbmRsZSBtdWx0aXBsZSBkZWNvZGViaW4gc291cmNlIHBhZHMg
YnkgaWdub3JpbmcgYWxsIGZvbGxvd2luZworICAgICAgICBvbmVzIGp1c3QgaW4gY2FzZSB0aGVy
ZSBhcmUgbXVsdGlwbGUgZm9yIHdoYXRldmVyIHJlYXNvbi4KKworICAgICAgICAoV2ViQ29yZTo6
QXVkaW9GaWxlUmVhZGVyOjpkZWNvZGVBdWRpb0ZvckJ1c0NyZWF0aW9uKToKKyAgICAgICAgQ2F0
Y2ggZXJyb3JzIGZyb20gZ29pbmcgdG8gUEFVU0VEIHN0YXRlIGVhcmx5LiBXZSBtaWdodCBub3QK
KyAgICAgICAgZ2V0IGEgZXJyb3IgbWVzc2FnZSBhdCBhbGwgaWYgd2UncmUgdW5sdWNreS4KKwor
ICAgICAgICAoV2ViQ29yZTo6QXVkaW9GaWxlUmVhZGVyOjpwbHVnRGVpbnRlcmxlYXZlKToKKyAg
ICAgICAgKFdlYkNvcmU6OkF1ZGlvRmlsZVJlYWRlcjo6Y3JlYXRlQnVzKToKKyAgICAgICAgRG93
bm1peCB0byBtb25vIGlmIHJlcXVpcmVkIGluc3RlYWQgb2YganVzdCB1c2luZyB0aGUgZnJvbnQK
KyAgICAgICAgbGVmdCBjaGFubmVsIGFuZCBjbGFpbWluZyBpdCBpcyBtb25vLiBEb3dubWl4aW5n
IGZyb20gc3RlcmVvCisgICAgICAgIHRvIG1vbm8gd2lsbCBtaXggYm90aCBjaGFubmVscyBpbnN0
ZWFkIG9mIGp1c3QgdGFraW5nIHRoZSBsZWZ0LgorCiAyMDE0LTEyLTA3ICBDYXJsb3MgR2FyY2lh
IENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBNaXNzaW5nIEFQ
SSBkZXRlY3RlZCBpbiBHT2JqZWN0IERPTSBiaW5kaW5ncyBhZnRlciByMTc2NjMwCmRpZmYgLS1n
aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9nc3RyZWFtZXIvQXVkaW9GaWxlUmVh
ZGVyR1N0cmVhbWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL2dzdHJlYW1l
ci9BdWRpb0ZpbGVSZWFkZXJHU3RyZWFtZXIuY3BwCmluZGV4IDA0YjhlYWJlY2EyZDBjZWNmOThi
MGY0OTE1YmEzMTE4ODgyNGNjYjUuLjM5YWIwYjY0OGYxMzM1YTNlNzJjZGViNzZiNGRlNTg5NzMz
NzA5YzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL2dzdHJlYW1l
ci9BdWRpb0ZpbGVSZWFkZXJHU3RyZWFtZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm
b3JtL2F1ZGlvL2dzdHJlYW1lci9BdWRpb0ZpbGVSZWFkZXJHU3RyZWFtZXIuY3BwCkBAIC01OSw2
ICs1OSw3IEBAIHByaXZhdGU6CiAgICAgY29uc3QgY2hhciogbV9maWxlUGF0aDsKIAogICAgIGZs
b2F0IG1fc2FtcGxlUmF0ZTsKKyAgICBpbnQgbV9jaGFubmVsczsKICAgICBHc3RCdWZmZXJMaXN0
KiBtX2Zyb250TGVmdEJ1ZmZlcnM7CiAgICAgR3N0QnVmZmVyTGlzdCogbV9mcm9udFJpZ2h0QnVm
ZmVyczsKIApAQCAtMTMyLDcgKzEzMyw2IEBAIEF1ZGlvRmlsZVJlYWRlcjo6fkF1ZGlvRmlsZVJl
YWRlcigpCiAgICAgICAgIEdSZWZQdHI8R3N0QnVzPiBidXMgPSBhZG9wdEdSZWYoZ3N0X3BpcGVs
aW5lX2dldF9idXMoR1NUX1BJUEVMSU5FKG1fcGlwZWxpbmUpKSk7CiAgICAgICAgIEFTU0VSVChi
dXMpOwogICAgICAgICBnX3NpZ25hbF9oYW5kbGVyc19kaXNjb25uZWN0X2J5X2Z1bmMoYnVzLmdl
dCgpLCByZWludGVycHJldF9jYXN0PGdwb2ludGVyPihtZXNzYWdlQ2FsbGJhY2spLCB0aGlzKTsK
LSAgICAgICAgZ3N0X2J1c19yZW1vdmVfc2lnbmFsX3dhdGNoKGJ1cy5nZXQoKSk7CiAKICAgICAg
ICAgZ3N0X2VsZW1lbnRfc2V0X3N0YXRlKG1fcGlwZWxpbmUsIEdTVF9TVEFURV9OVUxMKTsKICAg
ICAgICAgZ3N0X29iamVjdF91bnJlZihHU1RfT0JKRUNUKG1fcGlwZWxpbmUpKTsKQEAgLTE3Myw3
ICsxNzMsNyBAQCBHc3RGbG93UmV0dXJuIEF1ZGlvRmlsZVJlYWRlcjo6aGFuZGxlU2FtcGxlKEdz
dEFwcFNpbmsqIHNpbmspCiAKICAgICBHc3RBdWRpb0luZm8gaW5mbzsKICAgICBnc3RfYXVkaW9f
aW5mb19mcm9tX2NhcHMoJmluZm8sIGNhcHMpOwotICAgIGludCBmcmFtZXMgPSBHU1RfQ0xPQ0tf
VElNRV9UT19GUkFNRVMoR1NUX0JVRkZFUl9EVVJBVElPTihidWZmZXIpLCBHU1RfQVVESU9fSU5G
T19SQVRFKCZpbmZvKSk7CisgICAgaW50IGZyYW1lcyA9IGdzdF9idWZmZXJfZ2V0X3NpemUoYnVm
ZmVyKSAvIGluZm8uYnBmOwogCiAgICAgLy8gQ2hlY2sgdGhlIGZpcnN0IGF1ZGlvIGNoYW5uZWwu
IFRoZSBidWZmZXIgaXMgc3VwcG9zZWQgdG8gc3RvcmUKICAgICAvLyBkYXRhIG9mIGEgc2luZ2xl
IGNoYW5uZWwgYW55d2F5LgpAQCAtMTkxLDcgKzE5MSw2IEBAIEdzdEZsb3dSZXR1cm4gQXVkaW9G
aWxlUmVhZGVyOjpoYW5kbGVTYW1wbGUoR3N0QXBwU2luayogc2luaykKIAogICAgIGdzdF9zYW1w
bGVfdW5yZWYoc2FtcGxlKTsKICAgICByZXR1cm4gR1NUX0ZMT1dfT0s7Ci0KIH0KIAogZ2Jvb2xl
YW4gQXVkaW9GaWxlUmVhZGVyOjpoYW5kbGVNZXNzYWdlKEdzdE1lc3NhZ2UqIG1lc3NhZ2UpCkBA
IC0yMTEsNiArMjEwLDcgQEAgZ2Jvb2xlYW4gQXVkaW9GaWxlUmVhZGVyOjpoYW5kbGVNZXNzYWdl
KEdzdE1lc3NhZ2UqIG1lc3NhZ2UpCiAgICAgICAgIGdzdF9tZXNzYWdlX3BhcnNlX2Vycm9yKG1l
c3NhZ2UsICZlcnJvci5vdXRQdHIoKSwgJmRlYnVnLm91dFB0cigpKTsKICAgICAgICAgZ193YXJu
aW5nKCJFcnJvcjogJWQsICVzLiBEZWJ1ZyBvdXRwdXQ6ICVzIiwgZXJyb3ItPmNvZGUsICBlcnJv
ci0+bWVzc2FnZSwgZGVidWcuZ2V0KCkpOwogICAgICAgICBtX2Vycm9yT2NjdXJyZWQgPSB0cnVl
OworICAgICAgICBnc3RfZWxlbWVudF9zZXRfc3RhdGUobV9waXBlbGluZSwgR1NUX1NUQVRFX05V
TEwpOwogICAgICAgICBnX21haW5fbG9vcF9xdWl0KG1fbG9vcC5nZXQoKSk7CiAgICAgICAgIGJy
ZWFrOwogICAgIGRlZmF1bHQ6CkBAIC0yNDQsOCArMjQ0LDggQEAgdm9pZCBBdWRpb0ZpbGVSZWFk
ZXI6OmhhbmRsZU5ld0RlaW50ZXJsZWF2ZVBhZChHc3RQYWQqIHBhZCkKIAogICAgIGdzdF9lbGVt
ZW50X2xpbmtfcGFkc19mdWxsKHF1ZXVlLCAic3JjIiwgc2luaywgInNpbmsiLCBHU1RfUEFEX0xJ
TktfQ0hFQ0tfTk9USElORyk7CiAKLSAgICBnc3RfZWxlbWVudF9zZXRfc3RhdGUocXVldWUsIEdT
VF9TVEFURV9SRUFEWSk7Ci0gICAgZ3N0X2VsZW1lbnRfc2V0X3N0YXRlKHNpbmssIEdTVF9TVEFU
RV9SRUFEWSk7CisgICAgZ3N0X2VsZW1lbnRfc3luY19zdGF0ZV93aXRoX3BhcmVudChxdWV1ZSk7
CisgICAgZ3N0X2VsZW1lbnRfc3luY19zdGF0ZV93aXRoX3BhcmVudChzaW5rKTsKIH0KIAogdm9p
ZCBBdWRpb0ZpbGVSZWFkZXI6OmRlaW50ZXJsZWF2ZVBhZHNDb25maWd1cmVkKCkKQEAgLTI1Nyw2
ICsyNTcsMTAgQEAgdm9pZCBBdWRpb0ZpbGVSZWFkZXI6OmRlaW50ZXJsZWF2ZVBhZHNDb25maWd1
cmVkKCkKIAogdm9pZCBBdWRpb0ZpbGVSZWFkZXI6OnBsdWdEZWludGVybGVhdmUoR3N0UGFkKiBw
YWQpCiB7CisgICAgLy8gSWdub3JlIGFueSBhZGRpdGlvbmFsIHNvdXJjZSBwYWRzIGp1c3QgaW4g
Y2FzZQorICAgIGlmIChtX2RlSW50ZXJsZWF2ZSkKKyAgICAgICAgcmV0dXJuOworCiAgICAgLy8g
QSBkZWNvZGViaW4gcGFkIHdhcyBhZGRlZCwgcGx1ZyBpbiBhIGRlaW50ZXJsZWF2ZSBlbGVtZW50
IHRvCiAgICAgLy8gc2VwYXJhdGUgZWFjaCBwbGFuYXIgY2hhbm5lbC4gU3ViIHBpcGVsaW5lIGxv
b2tzIGxpa2UKICAgICAvLyAuLi4gZGVjb2RlYmluMiAhIGF1ZGlvY29udmVydCAhIGF1ZGlvcmVz
YW1wbGUgISBjYXBzZmlsdGVyICEgZGVpbnRlcmxlYXZlLgpAQCAtMjY5LDkgKzI3MywxMCBAQCB2
b2lkIEF1ZGlvRmlsZVJlYWRlcjo6cGx1Z0RlaW50ZXJsZWF2ZShHc3RQYWQqIHBhZCkKICAgICBn
X3NpZ25hbF9jb25uZWN0KG1fZGVJbnRlcmxlYXZlLmdldCgpLCAicGFkLWFkZGVkIiwgR19DQUxM
QkFDSyhvbkdTdHJlYW1lckRlaW50ZXJsZWF2ZVBhZEFkZGVkQ2FsbGJhY2spLCB0aGlzKTsKICAg
ICBnX3NpZ25hbF9jb25uZWN0KG1fZGVJbnRlcmxlYXZlLmdldCgpLCAibm8tbW9yZS1wYWRzIiwg
R19DQUxMQkFDSyhvbkdTdHJlYW1lckRlaW50ZXJsZWF2ZVJlYWR5Q2FsbGJhY2spLCB0aGlzKTsK
IAotICAgIEdzdENhcHMqIGNhcHMgPSBnc3RfY2Fwc19uZXdfc2ltcGxlKCJhdWRpby94LXJhdyIs
ICJyYXRlIiwgR19UWVBFX0lOVCwgc3RhdGljX2Nhc3Q8aW50PihtX3NhbXBsZVJhdGUpLAotICAg
ICAgICAiY2hhbm5lbHMiLCBHX1RZUEVfSU5ULCAyLAotICAgICAgICAiZm9ybWF0IiwgR19UWVBF
X1NUUklORywgZ3N0X2F1ZGlvX2Zvcm1hdF90b19zdHJpbmcoR1NUX0FVRElPX0ZPUk1BVF9GMzIp
LAorICAgIEdzdENhcHMqIGNhcHMgPSBnc3RfY2Fwc19uZXdfc2ltcGxlKCJhdWRpby94LXJhdyIs
CisgICAgICAgICJyYXRlIiwgR19UWVBFX0lOVCwgc3RhdGljX2Nhc3Q8aW50PihtX3NhbXBsZVJh
dGUpLAorICAgICAgICAiY2hhbm5lbHMiLCBHX1RZUEVfSU5ULCBtX2NoYW5uZWxzLAorICAgICAg
ICAiZm9ybWF0IiwgR19UWVBFX1NUUklORywgR1NUX0FVRElPX05FKEYzMiksCiAgICAgICAgICJs
YXlvdXQiLCBHX1RZUEVfU1RSSU5HLCAiaW50ZXJsZWF2ZWQiLCBudWxscHRyKTsKICAgICBnX29i
amVjdF9zZXQoY2Fwc0ZpbHRlciwgImNhcHMiLCBjYXBzLCBOVUxMKTsKICAgICBnc3RfY2Fwc191
bnJlZihjYXBzKTsKQEAgLTMxOSwxMiArMzI0LDIwIEBAIHZvaWQgQXVkaW9GaWxlUmVhZGVyOjpk
ZWNvZGVBdWRpb0ZvckJ1c0NyZWF0aW9uKCkKIAogICAgIGdzdF9iaW5fYWRkX21hbnkoR1NUX0JJ
TihtX3BpcGVsaW5lKSwgc291cmNlLCBtX2RlY29kZWJpbi5nZXQoKSwgTlVMTCk7CiAgICAgZ3N0
X2VsZW1lbnRfbGlua19wYWRzX2Z1bGwoc291cmNlLCAic3JjIiwgbV9kZWNvZGViaW4uZ2V0KCks
ICJzaW5rIiwgR1NUX1BBRF9MSU5LX0NIRUNLX05PVEhJTkcpOwotICAgIGdzdF9lbGVtZW50X3Nl
dF9zdGF0ZShtX3BpcGVsaW5lLCBHU1RfU1RBVEVfUEFVU0VEKTsKKworICAgIC8vIENhdGNoIGVy
cm9ycyBoZXJlIGltbWVkaWF0ZWx5LCB0aGVyZSBtaWdodCBub3QgYmUgYW4gZXJyb3IgbWVzc2Fn
ZSBpZgorICAgIC8vIHdlJ3JlIHVubHVja3kKKyAgICBpZiAoZ3N0X2VsZW1lbnRfc2V0X3N0YXRl
KG1fcGlwZWxpbmUsIEdTVF9TVEFURV9QQVVTRUQpID09IEdTVF9TVEFURV9DSEFOR0VfRkFJTFVS
RSkgeworICAgICAgICBnX3dhcm5pbmcoIkVycm9yOiBGYWlsZWQgdG8gc2V0IHBpcGVsaW5lIHRv
IFBBVVNFRCIpOworICAgICAgICBtX2Vycm9yT2NjdXJyZWQgPSB0cnVlOworICAgICAgICBnX21h
aW5fbG9vcF9xdWl0KG1fbG9vcC5nZXQoKSk7CisgICAgfQogfQogCiBQYXNzUmVmUHRyPEF1ZGlv
QnVzPiBBdWRpb0ZpbGVSZWFkZXI6OmNyZWF0ZUJ1cyhmbG9hdCBzYW1wbGVSYXRlLCBib29sIG1p
eFRvTW9ubykKIHsKICAgICBtX3NhbXBsZVJhdGUgPSBzYW1wbGVSYXRlOworICAgIG1fY2hhbm5l
bHMgPSBtaXhUb01vbm8gPyAxIDogMjsKIAogICAgIG1fZnJvbnRMZWZ0QnVmZmVycyA9IGdzdF9i
dWZmZXJfbGlzdF9uZXcoKTsKICAgICBtX2Zyb250UmlnaHRCdWZmZXJzID0gZ3N0X2J1ZmZlcl9s
aXN0X25ldygpOwpAQCAtMzQwLDExICszNTMsMTQgQEAgUGFzc1JlZlB0cjxBdWRpb0J1cz4gQXVk
aW9GaWxlUmVhZGVyOjpjcmVhdGVCdXMoZmxvYXQgc2FtcGxlUmF0ZSwgYm9vbCBtaXhUb01vbm8K
ICAgICBnX21haW5fbG9vcF9ydW4obV9sb29wLmdldCgpKTsKICAgICBnX21haW5fY29udGV4dF9w
b3BfdGhyZWFkX2RlZmF1bHQoY29udGV4dC5nZXQoKSk7CiAKKyAgICAvLyBTZXQgcGlwZWxpbmUg
dG8gR1NUX1NUQVRFX05VTEwgc3RhdGUgaGVyZSBhbHJlYWR5IEFTQVAgdG8KKyAgICAvLyByZWxl
YXNlIGFueSByZXNvdXJjZXMgdGhhdCBtaWdodCBzdGlsbCBiZSB1c2VkCisgICAgZ3N0X2VsZW1l
bnRfc2V0X3N0YXRlKG1fcGlwZWxpbmUsIEdTVF9TVEFURV9OVUxMKTsKKwogICAgIGlmIChtX2Vy
cm9yT2NjdXJyZWQpCiAgICAgICAgIHJldHVybiAwOwogCi0gICAgdW5zaWduZWQgY2hhbm5lbHMg
PSBtaXhUb01vbm8gPyAxIDogMjsKLSAgICBSZWZQdHI8QXVkaW9CdXM+IGF1ZGlvQnVzID0gQXVk
aW9CdXM6OmNyZWF0ZShjaGFubmVscywgbV9jaGFubmVsU2l6ZSwgdHJ1ZSk7CisgICAgUmVmUHRy
PEF1ZGlvQnVzPiBhdWRpb0J1cyA9IEF1ZGlvQnVzOjpjcmVhdGUobV9jaGFubmVscywgbV9jaGFu
bmVsU2l6ZSwgdHJ1ZSk7CiAgICAgYXVkaW9CdXMtPnNldFNhbXBsZVJhdGUobV9zYW1wbGVSYXRl
KTsKIAogICAgIGNvcHlHc3RyZWFtZXJCdWZmZXJzVG9BdWRpb0NoYW5uZWwobV9mcm9udExlZnRC
dWZmZXJzLCBhdWRpb0J1cy0+Y2hhbm5lbCgwKSk7Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>242751</attachid>
            <date>2014-12-07 09:10:48 -0800</date>
            <delta_ts>2014-12-07 13:15:22 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-139367-20141207181211.patch</filename>
            <type>text/plain</type>
            <size>8501</size>
            <attacher name="Sebastian Dröge (slomo)">slomo</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2OTE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODMzOWQ3Y2ViOTVjMDRh
ZmMwNTVhMzFkNDY0ZjA3NTFjOGM2ZTk0MC4uZDdlOWYyY2Q1OTNhNjM4NWI0MDIyYmE2NGRkZjEy
ODQ5NDRjYWQwNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDUwIEBACisyMDE0LTEyLTA3ICBTZWJh
c3RpYW4gRHLDtmdlICA8c2ViYXN0aWFuQGNlbnRyaWN1bGFyLmNvbT4KKworICAgICAgICBbR1N0
cmVhbWVyXSBNaW5vciBjbGVhbnVwIG9mIHRoZSBBdWRpb0ZpbGVSZWFkZXIgaW1wbGVtZW50YXRp
b24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzOTM2
NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxh
dGZvcm0vYXVkaW8vZ3N0cmVhbWVyL0F1ZGlvRmlsZVJlYWRlckdTdHJlYW1lci5jcHA6CisgICAg
ICAgIChXZWJDb3JlOjpBdWRpb0ZpbGVSZWFkZXI6On5BdWRpb0ZpbGVSZWFkZXIpOgorICAgICAg
ICBEb24ndCBjYWxsIGdzdF9idXNfcmVtb3ZlX3NpZ25hbF93YXRjaCgpLCB0aGUgc291cmNlIHdh
cyBhbHJlYWR5CisgICAgICAgIGRlc3Ryb3llZCB0b2dldGhlciB3aXRoIHRoZSBtYWluIGNvbnRl
eHQgYW5kIGRvaW5nIGl0IGFnYWluIGhlcmUKKyAgICAgICAgd2lsbCBnaXZlIGEgZ19jcml0aWNh
bCgpLgorCisgICAgICAgIChXZWJDb3JlOjpBdWRpb0ZpbGVSZWFkZXI6OmhhbmRsZVNhbXBsZSk6
CisgICAgICAgIENhbGN1bGF0ZSB0aGUgbnVtYmVyIG9mIHNhbXBsZXMgZnJvbSB0aGUgYWN0dWFs
IGJ1ZmZlciBzaXplCisgICAgICAgIGFuZCB0aGUgYnl0ZXMtcGVyLWZyYW1lIGluc3RlYWQgb2Yg
dGhlIGJ1ZmZlciBkdXJhdGlvbi4gVXNpbmcKKyAgICAgICAgdGhlIGJ1ZmZlciBkdXJhdGlvbiBj
YW4gbGVhZCB0byByb3VuZGluZyBlcnJvcnMgYW5kIG1pZ2h0IGNhdXNlCisgICAgICAgIHRvbyBm
ZXcgc2FtcGxlcyB0byBiZSBjb3BpZWQgb3ZlciBsYXRlci4KKworICAgICAgICAoV2ViQ29yZTo6
QXVkaW9GaWxlUmVhZGVyOjpoYW5kbGVNZXNzYWdlKToKKyAgICAgICAgU2V0IHRoZSBwaXBlbGlu
ZSB0byBHU1RfU1RBVEVfTlVMTCBpbW1lZGlhdGVseSB3aGVuIHJlY2VpdmluZworICAgICAgICBl
cnJvcnMgdG8gcHJldmVudCBvdGhlciBmb2xsb3ctdXAgZXJyb3IgbWVzc2FnZXMgZnJvbSBwcm9w
YWdhdGluZworICAgICAgICB0aHJvdWdoIHRoZSBidXMgYW5kIHNwYW1taW5nIHRoZSB1c2VyJ3Mg
dGVybWluYWwgd2l0aCBnX3dhcm5pbmdzKCkuCisKKyAgICAgICAgKFdlYkNvcmU6OkF1ZGlvRmls
ZVJlYWRlcjo6aGFuZGxlTmV3RGVpbnRlcmxlYXZlUGFkKToKKyAgICAgICAgU3luYyB0aGUgc3Rh
dGUgb2YgdGhlIHF1ZXVlIGFuZCBzaW5rIGFmdGVyIGRlaW50ZXJsZWF2ZSB3aXRoCisgICAgICAg
IHRoZSBwYXJlbnQgc3RhdGUgaW5zdGVhZCBvZiBqdXN0IHNldHRpbmcgdGhlbSB0byBSRUFEWS4g
VGhhdAorICAgICAgICB3YXkgd2UgcG90ZW50aWFsbHkgZ28gdG8gUEFVU0VEIHN0YXRlIGEgYml0
IGVhcmxpZXIgYWxyZWFkeQorICAgICAgICBhbmQgcHJldmVudCBhIHBvdGVudGlhbCByYWNlIGNv
bmRpdGlvbiB0aGF0IGNvdWxkIGNhdXNlIGJ1ZmZlcnMKKyAgICAgICAgdG8gYXJyaXZlIGluIHRo
ZSBuZXcgZWxlbWVudHMgaW4gUkVBRFkgc3RhdGUgYWxyZWFkeSAod2hpY2ggd291bGQKKyAgICAg
ICAgZmFpbCkuCisKKyAgICAgICAgKFdlYkNvcmU6OkF1ZGlvRmlsZVJlYWRlcjo6cGx1Z0RlaW50
ZXJsZWF2ZSk6CisgICAgICAgIEhhbmRsZSBtdWx0aXBsZSBkZWNvZGViaW4gc291cmNlIHBhZHMg
YnkgaWdub3JpbmcgYWxsIGZvbGxvd2luZworICAgICAgICBvbmVzIGp1c3QgaW4gY2FzZSB0aGVy
ZSBhcmUgbXVsdGlwbGUgZm9yIHdoYXRldmVyIHJlYXNvbi4KKworICAgICAgICAoV2ViQ29yZTo6
QXVkaW9GaWxlUmVhZGVyOjpkZWNvZGVBdWRpb0ZvckJ1c0NyZWF0aW9uKToKKyAgICAgICAgQ2F0
Y2ggZXJyb3JzIGZyb20gZ29pbmcgdG8gUEFVU0VEIHN0YXRlIGVhcmx5LiBXZSBtaWdodCBub3QK
KyAgICAgICAgZ2V0IGEgZXJyb3IgbWVzc2FnZSBhdCBhbGwgaWYgd2UncmUgdW5sdWNreS4KKwor
ICAgICAgICAoV2ViQ29yZTo6QXVkaW9GaWxlUmVhZGVyOjpwbHVnRGVpbnRlcmxlYXZlKToKKyAg
ICAgICAgKFdlYkNvcmU6OkF1ZGlvRmlsZVJlYWRlcjo6Y3JlYXRlQnVzKToKKyAgICAgICAgKFdl
YkNvcmU6OkF1ZGlvRmlsZVJlYWRlcjo6aGFuZGxlU2FtcGxlKToKKyAgICAgICAgRG93bm1peCB0
byBtb25vIGlmIHJlcXVpcmVkIGluc3RlYWQgb2YganVzdCB1c2luZyB0aGUgZnJvbnQKKyAgICAg
ICAgbGVmdCBjaGFubmVsIGFuZCBjbGFpbWluZyBpdCBpcyBtb25vLiBEb3dubWl4aW5nIGZyb20g
c3RlcmVvCisgICAgICAgIHRvIG1vbm8gd2lsbCBtaXggYm90aCBjaGFubmVscyBpbnN0ZWFkIG9m
IGp1c3QgdGFraW5nIHRoZSBsZWZ0LgorCiAyMDE0LTEyLTA3ICBDYXJsb3MgR2FyY2lhIENhbXBv
cyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBNaXNzaW5nIEFQSSBkZXRl
Y3RlZCBpbiBHT2JqZWN0IERPTSBiaW5kaW5ncyBhZnRlciByMTc2NjMwCmRpZmYgLS1naXQgYS9T
b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9nc3RyZWFtZXIvQXVkaW9GaWxlUmVhZGVyR1N0
cmVhbWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL2dzdHJlYW1lci9BdWRp
b0ZpbGVSZWFkZXJHU3RyZWFtZXIuY3BwCmluZGV4IDA0YjhlYWJlY2EyZDBjZWNmOThiMGY0OTE1
YmEzMTE4ODgyNGNjYjUuLmQxN2E5NzRkNWE4MTExODExMDhjN2M5NDhmNzMxOTUzNDhhNzdjNzMg
MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL2dzdHJlYW1lci9BdWRp
b0ZpbGVSZWFkZXJHU3RyZWFtZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1
ZGlvL2dzdHJlYW1lci9BdWRpb0ZpbGVSZWFkZXJHU3RyZWFtZXIuY3BwCkBAIC01OSw2ICs1OSw3
IEBAIHByaXZhdGU6CiAgICAgY29uc3QgY2hhciogbV9maWxlUGF0aDsKIAogICAgIGZsb2F0IG1f
c2FtcGxlUmF0ZTsKKyAgICBpbnQgbV9jaGFubmVsczsKICAgICBHc3RCdWZmZXJMaXN0KiBtX2Zy
b250TGVmdEJ1ZmZlcnM7CiAgICAgR3N0QnVmZmVyTGlzdCogbV9mcm9udFJpZ2h0QnVmZmVyczsK
IApAQCAtMTMyLDcgKzEzMyw2IEBAIEF1ZGlvRmlsZVJlYWRlcjo6fkF1ZGlvRmlsZVJlYWRlcigp
CiAgICAgICAgIEdSZWZQdHI8R3N0QnVzPiBidXMgPSBhZG9wdEdSZWYoZ3N0X3BpcGVsaW5lX2dl
dF9idXMoR1NUX1BJUEVMSU5FKG1fcGlwZWxpbmUpKSk7CiAgICAgICAgIEFTU0VSVChidXMpOwog
ICAgICAgICBnX3NpZ25hbF9oYW5kbGVyc19kaXNjb25uZWN0X2J5X2Z1bmMoYnVzLmdldCgpLCBy
ZWludGVycHJldF9jYXN0PGdwb2ludGVyPihtZXNzYWdlQ2FsbGJhY2spLCB0aGlzKTsKLSAgICAg
ICAgZ3N0X2J1c19yZW1vdmVfc2lnbmFsX3dhdGNoKGJ1cy5nZXQoKSk7CiAKICAgICAgICAgZ3N0
X2VsZW1lbnRfc2V0X3N0YXRlKG1fcGlwZWxpbmUsIEdTVF9TVEFURV9OVUxMKTsKICAgICAgICAg
Z3N0X29iamVjdF91bnJlZihHU1RfT0JKRUNUKG1fcGlwZWxpbmUpKTsKQEAgLTE3MywxMiArMTcz
LDEzIEBAIEdzdEZsb3dSZXR1cm4gQXVkaW9GaWxlUmVhZGVyOjpoYW5kbGVTYW1wbGUoR3N0QXBw
U2luayogc2luaykKIAogICAgIEdzdEF1ZGlvSW5mbyBpbmZvOwogICAgIGdzdF9hdWRpb19pbmZv
X2Zyb21fY2FwcygmaW5mbywgY2Fwcyk7Ci0gICAgaW50IGZyYW1lcyA9IEdTVF9DTE9DS19USU1F
X1RPX0ZSQU1FUyhHU1RfQlVGRkVSX0RVUkFUSU9OKGJ1ZmZlciksIEdTVF9BVURJT19JTkZPX1JB
VEUoJmluZm8pKTsKKyAgICBpbnQgZnJhbWVzID0gZ3N0X2J1ZmZlcl9nZXRfc2l6ZShidWZmZXIp
IC8gaW5mby5icGY7CiAKICAgICAvLyBDaGVjayB0aGUgZmlyc3QgYXVkaW8gY2hhbm5lbC4gVGhl
IGJ1ZmZlciBpcyBzdXBwb3NlZCB0byBzdG9yZQogICAgIC8vIGRhdGEgb2YgYSBzaW5nbGUgY2hh
bm5lbCBhbnl3YXkuCiAgICAgc3dpdGNoIChHU1RfQVVESU9fSU5GT19QT1NJVElPTigmaW5mbywg
MCkpIHsKICAgICBjYXNlIEdTVF9BVURJT19DSEFOTkVMX1BPU0lUSU9OX0ZST05UX0xFRlQ6Cisg
ICAgY2FzZSBHU1RfQVVESU9fQ0hBTk5FTF9QT1NJVElPTl9NT05POgogICAgICAgICBnc3RfYnVm
ZmVyX2xpc3RfYWRkKG1fZnJvbnRMZWZ0QnVmZmVycywgZ3N0X2J1ZmZlcl9yZWYoYnVmZmVyKSk7
CiAgICAgICAgIG1fY2hhbm5lbFNpemUgKz0gZnJhbWVzOwogICAgICAgICBicmVhazsKQEAgLTE5
MSw3ICsxOTIsNiBAQCBHc3RGbG93UmV0dXJuIEF1ZGlvRmlsZVJlYWRlcjo6aGFuZGxlU2FtcGxl
KEdzdEFwcFNpbmsqIHNpbmspCiAKICAgICBnc3Rfc2FtcGxlX3VucmVmKHNhbXBsZSk7CiAgICAg
cmV0dXJuIEdTVF9GTE9XX09LOwotCiB9CiAKIGdib29sZWFuIEF1ZGlvRmlsZVJlYWRlcjo6aGFu
ZGxlTWVzc2FnZShHc3RNZXNzYWdlKiBtZXNzYWdlKQpAQCAtMjExLDYgKzIxMSw3IEBAIGdib29s
ZWFuIEF1ZGlvRmlsZVJlYWRlcjo6aGFuZGxlTWVzc2FnZShHc3RNZXNzYWdlKiBtZXNzYWdlKQog
ICAgICAgICBnc3RfbWVzc2FnZV9wYXJzZV9lcnJvcihtZXNzYWdlLCAmZXJyb3Iub3V0UHRyKCks
ICZkZWJ1Zy5vdXRQdHIoKSk7CiAgICAgICAgIGdfd2FybmluZygiRXJyb3I6ICVkLCAlcy4gRGVi
dWcgb3V0cHV0OiAlcyIsIGVycm9yLT5jb2RlLCAgZXJyb3ItPm1lc3NhZ2UsIGRlYnVnLmdldCgp
KTsKICAgICAgICAgbV9lcnJvck9jY3VycmVkID0gdHJ1ZTsKKyAgICAgICAgZ3N0X2VsZW1lbnRf
c2V0X3N0YXRlKG1fcGlwZWxpbmUsIEdTVF9TVEFURV9OVUxMKTsKICAgICAgICAgZ19tYWluX2xv
b3BfcXVpdChtX2xvb3AuZ2V0KCkpOwogICAgICAgICBicmVhazsKICAgICBkZWZhdWx0OgpAQCAt
MjQ0LDggKzI0NSw4IEBAIHZvaWQgQXVkaW9GaWxlUmVhZGVyOjpoYW5kbGVOZXdEZWludGVybGVh
dmVQYWQoR3N0UGFkKiBwYWQpCiAKICAgICBnc3RfZWxlbWVudF9saW5rX3BhZHNfZnVsbChxdWV1
ZSwgInNyYyIsIHNpbmssICJzaW5rIiwgR1NUX1BBRF9MSU5LX0NIRUNLX05PVEhJTkcpOwogCi0g
ICAgZ3N0X2VsZW1lbnRfc2V0X3N0YXRlKHF1ZXVlLCBHU1RfU1RBVEVfUkVBRFkpOwotICAgIGdz
dF9lbGVtZW50X3NldF9zdGF0ZShzaW5rLCBHU1RfU1RBVEVfUkVBRFkpOworICAgIGdzdF9lbGVt
ZW50X3N5bmNfc3RhdGVfd2l0aF9wYXJlbnQocXVldWUpOworICAgIGdzdF9lbGVtZW50X3N5bmNf
c3RhdGVfd2l0aF9wYXJlbnQoc2luayk7CiB9CiAKIHZvaWQgQXVkaW9GaWxlUmVhZGVyOjpkZWlu
dGVybGVhdmVQYWRzQ29uZmlndXJlZCgpCkBAIC0yNTcsNiArMjU4LDEwIEBAIHZvaWQgQXVkaW9G
aWxlUmVhZGVyOjpkZWludGVybGVhdmVQYWRzQ29uZmlndXJlZCgpCiAKIHZvaWQgQXVkaW9GaWxl
UmVhZGVyOjpwbHVnRGVpbnRlcmxlYXZlKEdzdFBhZCogcGFkKQogeworICAgIC8vIElnbm9yZSBh
bnkgYWRkaXRpb25hbCBzb3VyY2UgcGFkcyBqdXN0IGluIGNhc2UKKyAgICBpZiAobV9kZUludGVy
bGVhdmUpCisgICAgICAgIHJldHVybjsKKwogICAgIC8vIEEgZGVjb2RlYmluIHBhZCB3YXMgYWRk
ZWQsIHBsdWcgaW4gYSBkZWludGVybGVhdmUgZWxlbWVudCB0bwogICAgIC8vIHNlcGFyYXRlIGVh
Y2ggcGxhbmFyIGNoYW5uZWwuIFN1YiBwaXBlbGluZSBsb29rcyBsaWtlCiAgICAgLy8gLi4uIGRl
Y29kZWJpbjIgISBhdWRpb2NvbnZlcnQgISBhdWRpb3Jlc2FtcGxlICEgY2Fwc2ZpbHRlciAhIGRl
aW50ZXJsZWF2ZS4KQEAgLTI2OSw5ICsyNzQsMTAgQEAgdm9pZCBBdWRpb0ZpbGVSZWFkZXI6OnBs
dWdEZWludGVybGVhdmUoR3N0UGFkKiBwYWQpCiAgICAgZ19zaWduYWxfY29ubmVjdChtX2RlSW50
ZXJsZWF2ZS5nZXQoKSwgInBhZC1hZGRlZCIsIEdfQ0FMTEJBQ0sob25HU3RyZWFtZXJEZWludGVy
bGVhdmVQYWRBZGRlZENhbGxiYWNrKSwgdGhpcyk7CiAgICAgZ19zaWduYWxfY29ubmVjdChtX2Rl
SW50ZXJsZWF2ZS5nZXQoKSwgIm5vLW1vcmUtcGFkcyIsIEdfQ0FMTEJBQ0sob25HU3RyZWFtZXJE
ZWludGVybGVhdmVSZWFkeUNhbGxiYWNrKSwgdGhpcyk7CiAKLSAgICBHc3RDYXBzKiBjYXBzID0g
Z3N0X2NhcHNfbmV3X3NpbXBsZSgiYXVkaW8veC1yYXciLCAicmF0ZSIsIEdfVFlQRV9JTlQsIHN0
YXRpY19jYXN0PGludD4obV9zYW1wbGVSYXRlKSwKLSAgICAgICAgImNoYW5uZWxzIiwgR19UWVBF
X0lOVCwgMiwKLSAgICAgICAgImZvcm1hdCIsIEdfVFlQRV9TVFJJTkcsIGdzdF9hdWRpb19mb3Jt
YXRfdG9fc3RyaW5nKEdTVF9BVURJT19GT1JNQVRfRjMyKSwKKyAgICBHc3RDYXBzKiBjYXBzID0g
Z3N0X2NhcHNfbmV3X3NpbXBsZSgiYXVkaW8veC1yYXciLAorICAgICAgICAicmF0ZSIsIEdfVFlQ
RV9JTlQsIHN0YXRpY19jYXN0PGludD4obV9zYW1wbGVSYXRlKSwKKyAgICAgICAgImNoYW5uZWxz
IiwgR19UWVBFX0lOVCwgbV9jaGFubmVscywKKyAgICAgICAgImZvcm1hdCIsIEdfVFlQRV9TVFJJ
TkcsIEdTVF9BVURJT19ORShGMzIpLAogICAgICAgICAibGF5b3V0IiwgR19UWVBFX1NUUklORywg
ImludGVybGVhdmVkIiwgbnVsbHB0cik7CiAgICAgZ19vYmplY3Rfc2V0KGNhcHNGaWx0ZXIsICJj
YXBzIiwgY2FwcywgTlVMTCk7CiAgICAgZ3N0X2NhcHNfdW5yZWYoY2Fwcyk7CkBAIC0zMTksMTIg
KzMyNSwyMCBAQCB2b2lkIEF1ZGlvRmlsZVJlYWRlcjo6ZGVjb2RlQXVkaW9Gb3JCdXNDcmVhdGlv
bigpCiAKICAgICBnc3RfYmluX2FkZF9tYW55KEdTVF9CSU4obV9waXBlbGluZSksIHNvdXJjZSwg
bV9kZWNvZGViaW4uZ2V0KCksIE5VTEwpOwogICAgIGdzdF9lbGVtZW50X2xpbmtfcGFkc19mdWxs
KHNvdXJjZSwgInNyYyIsIG1fZGVjb2RlYmluLmdldCgpLCAic2luayIsIEdTVF9QQURfTElOS19D
SEVDS19OT1RISU5HKTsKLSAgICBnc3RfZWxlbWVudF9zZXRfc3RhdGUobV9waXBlbGluZSwgR1NU
X1NUQVRFX1BBVVNFRCk7CisKKyAgICAvLyBDYXRjaCBlcnJvcnMgaGVyZSBpbW1lZGlhdGVseSwg
dGhlcmUgbWlnaHQgbm90IGJlIGFuIGVycm9yIG1lc3NhZ2UgaWYKKyAgICAvLyB3ZSdyZSB1bmx1
Y2t5CisgICAgaWYgKGdzdF9lbGVtZW50X3NldF9zdGF0ZShtX3BpcGVsaW5lLCBHU1RfU1RBVEVf
UEFVU0VEKSA9PSBHU1RfU1RBVEVfQ0hBTkdFX0ZBSUxVUkUpIHsKKyAgICAgICAgZ193YXJuaW5n
KCJFcnJvcjogRmFpbGVkIHRvIHNldCBwaXBlbGluZSB0byBQQVVTRUQiKTsKKyAgICAgICAgbV9l
cnJvck9jY3VycmVkID0gdHJ1ZTsKKyAgICAgICAgZ19tYWluX2xvb3BfcXVpdChtX2xvb3AuZ2V0
KCkpOworICAgIH0KIH0KIAogUGFzc1JlZlB0cjxBdWRpb0J1cz4gQXVkaW9GaWxlUmVhZGVyOjpj
cmVhdGVCdXMoZmxvYXQgc2FtcGxlUmF0ZSwgYm9vbCBtaXhUb01vbm8pCiB7CiAgICAgbV9zYW1w
bGVSYXRlID0gc2FtcGxlUmF0ZTsKKyAgICBtX2NoYW5uZWxzID0gbWl4VG9Nb25vID8gMSA6IDI7
CiAKICAgICBtX2Zyb250TGVmdEJ1ZmZlcnMgPSBnc3RfYnVmZmVyX2xpc3RfbmV3KCk7CiAgICAg
bV9mcm9udFJpZ2h0QnVmZmVycyA9IGdzdF9idWZmZXJfbGlzdF9uZXcoKTsKQEAgLTM0MCwxMSAr
MzU0LDE0IEBAIFBhc3NSZWZQdHI8QXVkaW9CdXM+IEF1ZGlvRmlsZVJlYWRlcjo6Y3JlYXRlQnVz
KGZsb2F0IHNhbXBsZVJhdGUsIGJvb2wgbWl4VG9Nb25vCiAgICAgZ19tYWluX2xvb3BfcnVuKG1f
bG9vcC5nZXQoKSk7CiAgICAgZ19tYWluX2NvbnRleHRfcG9wX3RocmVhZF9kZWZhdWx0KGNvbnRl
eHQuZ2V0KCkpOwogCisgICAgLy8gU2V0IHBpcGVsaW5lIHRvIEdTVF9TVEFURV9OVUxMIHN0YXRl
IGhlcmUgYWxyZWFkeSBBU0FQIHRvCisgICAgLy8gcmVsZWFzZSBhbnkgcmVzb3VyY2VzIHRoYXQg
bWlnaHQgc3RpbGwgYmUgdXNlZAorICAgIGdzdF9lbGVtZW50X3NldF9zdGF0ZShtX3BpcGVsaW5l
LCBHU1RfU1RBVEVfTlVMTCk7CisKICAgICBpZiAobV9lcnJvck9jY3VycmVkKQogICAgICAgICBy
ZXR1cm4gMDsKIAotICAgIHVuc2lnbmVkIGNoYW5uZWxzID0gbWl4VG9Nb25vID8gMSA6IDI7Ci0g
ICAgUmVmUHRyPEF1ZGlvQnVzPiBhdWRpb0J1cyA9IEF1ZGlvQnVzOjpjcmVhdGUoY2hhbm5lbHMs
IG1fY2hhbm5lbFNpemUsIHRydWUpOworICAgIFJlZlB0cjxBdWRpb0J1cz4gYXVkaW9CdXMgPSBB
dWRpb0J1czo6Y3JlYXRlKG1fY2hhbm5lbHMsIG1fY2hhbm5lbFNpemUsIHRydWUpOwogICAgIGF1
ZGlvQnVzLT5zZXRTYW1wbGVSYXRlKG1fc2FtcGxlUmF0ZSk7CiAKICAgICBjb3B5R3N0cmVhbWVy
QnVmZmVyc1RvQXVkaW9DaGFubmVsKG1fZnJvbnRMZWZ0QnVmZmVycywgYXVkaW9CdXMtPmNoYW5u
ZWwoMCkpOwo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>242766</attachid>
            <date>2014-12-07 13:15:28 -0800</date>
            <delta_ts>2014-12-08 01:26:07 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-139367-20141207221651.patch</filename>
            <type>text/plain</type>
            <size>8504</size>
            <attacher name="Sebastian Dröge (slomo)">slomo</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2OTE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODMzOWQ3Y2ViOTVjMDRh
ZmMwNTVhMzFkNDY0ZjA3NTFjOGM2ZTk0MC4uZDdlOWYyY2Q1OTNhNjM4NWI0MDIyYmE2NGRkZjEy
ODQ5NDRjYWQwNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDUwIEBACisyMDE0LTEyLTA3ICBTZWJh
c3RpYW4gRHLDtmdlICA8c2ViYXN0aWFuQGNlbnRyaWN1bGFyLmNvbT4KKworICAgICAgICBbR1N0
cmVhbWVyXSBNaW5vciBjbGVhbnVwIG9mIHRoZSBBdWRpb0ZpbGVSZWFkZXIgaW1wbGVtZW50YXRp
b24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzOTM2
NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxh
dGZvcm0vYXVkaW8vZ3N0cmVhbWVyL0F1ZGlvRmlsZVJlYWRlckdTdHJlYW1lci5jcHA6CisgICAg
ICAgIChXZWJDb3JlOjpBdWRpb0ZpbGVSZWFkZXI6On5BdWRpb0ZpbGVSZWFkZXIpOgorICAgICAg
ICBEb24ndCBjYWxsIGdzdF9idXNfcmVtb3ZlX3NpZ25hbF93YXRjaCgpLCB0aGUgc291cmNlIHdh
cyBhbHJlYWR5CisgICAgICAgIGRlc3Ryb3llZCB0b2dldGhlciB3aXRoIHRoZSBtYWluIGNvbnRl
eHQgYW5kIGRvaW5nIGl0IGFnYWluIGhlcmUKKyAgICAgICAgd2lsbCBnaXZlIGEgZ19jcml0aWNh
bCgpLgorCisgICAgICAgIChXZWJDb3JlOjpBdWRpb0ZpbGVSZWFkZXI6OmhhbmRsZVNhbXBsZSk6
CisgICAgICAgIENhbGN1bGF0ZSB0aGUgbnVtYmVyIG9mIHNhbXBsZXMgZnJvbSB0aGUgYWN0dWFs
IGJ1ZmZlciBzaXplCisgICAgICAgIGFuZCB0aGUgYnl0ZXMtcGVyLWZyYW1lIGluc3RlYWQgb2Yg
dGhlIGJ1ZmZlciBkdXJhdGlvbi4gVXNpbmcKKyAgICAgICAgdGhlIGJ1ZmZlciBkdXJhdGlvbiBj
YW4gbGVhZCB0byByb3VuZGluZyBlcnJvcnMgYW5kIG1pZ2h0IGNhdXNlCisgICAgICAgIHRvbyBm
ZXcgc2FtcGxlcyB0byBiZSBjb3BpZWQgb3ZlciBsYXRlci4KKworICAgICAgICAoV2ViQ29yZTo6
QXVkaW9GaWxlUmVhZGVyOjpoYW5kbGVNZXNzYWdlKToKKyAgICAgICAgU2V0IHRoZSBwaXBlbGlu
ZSB0byBHU1RfU1RBVEVfTlVMTCBpbW1lZGlhdGVseSB3aGVuIHJlY2VpdmluZworICAgICAgICBl
cnJvcnMgdG8gcHJldmVudCBvdGhlciBmb2xsb3ctdXAgZXJyb3IgbWVzc2FnZXMgZnJvbSBwcm9w
YWdhdGluZworICAgICAgICB0aHJvdWdoIHRoZSBidXMgYW5kIHNwYW1taW5nIHRoZSB1c2VyJ3Mg
dGVybWluYWwgd2l0aCBnX3dhcm5pbmdzKCkuCisKKyAgICAgICAgKFdlYkNvcmU6OkF1ZGlvRmls
ZVJlYWRlcjo6aGFuZGxlTmV3RGVpbnRlcmxlYXZlUGFkKToKKyAgICAgICAgU3luYyB0aGUgc3Rh
dGUgb2YgdGhlIHF1ZXVlIGFuZCBzaW5rIGFmdGVyIGRlaW50ZXJsZWF2ZSB3aXRoCisgICAgICAg
IHRoZSBwYXJlbnQgc3RhdGUgaW5zdGVhZCBvZiBqdXN0IHNldHRpbmcgdGhlbSB0byBSRUFEWS4g
VGhhdAorICAgICAgICB3YXkgd2UgcG90ZW50aWFsbHkgZ28gdG8gUEFVU0VEIHN0YXRlIGEgYml0
IGVhcmxpZXIgYWxyZWFkeQorICAgICAgICBhbmQgcHJldmVudCBhIHBvdGVudGlhbCByYWNlIGNv
bmRpdGlvbiB0aGF0IGNvdWxkIGNhdXNlIGJ1ZmZlcnMKKyAgICAgICAgdG8gYXJyaXZlIGluIHRo
ZSBuZXcgZWxlbWVudHMgaW4gUkVBRFkgc3RhdGUgYWxyZWFkeSAod2hpY2ggd291bGQKKyAgICAg
ICAgZmFpbCkuCisKKyAgICAgICAgKFdlYkNvcmU6OkF1ZGlvRmlsZVJlYWRlcjo6cGx1Z0RlaW50
ZXJsZWF2ZSk6CisgICAgICAgIEhhbmRsZSBtdWx0aXBsZSBkZWNvZGViaW4gc291cmNlIHBhZHMg
YnkgaWdub3JpbmcgYWxsIGZvbGxvd2luZworICAgICAgICBvbmVzIGp1c3QgaW4gY2FzZSB0aGVy
ZSBhcmUgbXVsdGlwbGUgZm9yIHdoYXRldmVyIHJlYXNvbi4KKworICAgICAgICAoV2ViQ29yZTo6
QXVkaW9GaWxlUmVhZGVyOjpkZWNvZGVBdWRpb0ZvckJ1c0NyZWF0aW9uKToKKyAgICAgICAgQ2F0
Y2ggZXJyb3JzIGZyb20gZ29pbmcgdG8gUEFVU0VEIHN0YXRlIGVhcmx5LiBXZSBtaWdodCBub3QK
KyAgICAgICAgZ2V0IGEgZXJyb3IgbWVzc2FnZSBhdCBhbGwgaWYgd2UncmUgdW5sdWNreS4KKwor
ICAgICAgICAoV2ViQ29yZTo6QXVkaW9GaWxlUmVhZGVyOjpwbHVnRGVpbnRlcmxlYXZlKToKKyAg
ICAgICAgKFdlYkNvcmU6OkF1ZGlvRmlsZVJlYWRlcjo6Y3JlYXRlQnVzKToKKyAgICAgICAgKFdl
YkNvcmU6OkF1ZGlvRmlsZVJlYWRlcjo6aGFuZGxlU2FtcGxlKToKKyAgICAgICAgRG93bm1peCB0
byBtb25vIGlmIHJlcXVpcmVkIGluc3RlYWQgb2YganVzdCB1c2luZyB0aGUgZnJvbnQKKyAgICAg
ICAgbGVmdCBjaGFubmVsIGFuZCBjbGFpbWluZyBpdCBpcyBtb25vLiBEb3dubWl4aW5nIGZyb20g
c3RlcmVvCisgICAgICAgIHRvIG1vbm8gd2lsbCBtaXggYm90aCBjaGFubmVscyBpbnN0ZWFkIG9m
IGp1c3QgdGFraW5nIHRoZSBsZWZ0LgorCiAyMDE0LTEyLTA3ICBDYXJsb3MgR2FyY2lhIENhbXBv
cyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBNaXNzaW5nIEFQSSBkZXRl
Y3RlZCBpbiBHT2JqZWN0IERPTSBiaW5kaW5ncyBhZnRlciByMTc2NjMwCmRpZmYgLS1naXQgYS9T
b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9nc3RyZWFtZXIvQXVkaW9GaWxlUmVhZGVyR1N0
cmVhbWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL2dzdHJlYW1lci9BdWRp
b0ZpbGVSZWFkZXJHU3RyZWFtZXIuY3BwCmluZGV4IDA0YjhlYWJlY2EyZDBjZWNmOThiMGY0OTE1
YmEzMTE4ODgyNGNjYjUuLjk0YTlhOTVkMWViM2JjYjg0NzkwZDhmOGFkNGMyYzYzNjE0NzgyMGYg
MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL2dzdHJlYW1lci9BdWRp
b0ZpbGVSZWFkZXJHU3RyZWFtZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1
ZGlvL2dzdHJlYW1lci9BdWRpb0ZpbGVSZWFkZXJHU3RyZWFtZXIuY3BwCkBAIC01OSw2ICs1OSw3
IEBAIHByaXZhdGU6CiAgICAgY29uc3QgY2hhciogbV9maWxlUGF0aDsKIAogICAgIGZsb2F0IG1f
c2FtcGxlUmF0ZTsKKyAgICBpbnQgbV9jaGFubmVsczsKICAgICBHc3RCdWZmZXJMaXN0KiBtX2Zy
b250TGVmdEJ1ZmZlcnM7CiAgICAgR3N0QnVmZmVyTGlzdCogbV9mcm9udFJpZ2h0QnVmZmVyczsK
IApAQCAtMTMyLDcgKzEzMyw2IEBAIEF1ZGlvRmlsZVJlYWRlcjo6fkF1ZGlvRmlsZVJlYWRlcigp
CiAgICAgICAgIEdSZWZQdHI8R3N0QnVzPiBidXMgPSBhZG9wdEdSZWYoZ3N0X3BpcGVsaW5lX2dl
dF9idXMoR1NUX1BJUEVMSU5FKG1fcGlwZWxpbmUpKSk7CiAgICAgICAgIEFTU0VSVChidXMpOwog
ICAgICAgICBnX3NpZ25hbF9oYW5kbGVyc19kaXNjb25uZWN0X2J5X2Z1bmMoYnVzLmdldCgpLCBy
ZWludGVycHJldF9jYXN0PGdwb2ludGVyPihtZXNzYWdlQ2FsbGJhY2spLCB0aGlzKTsKLSAgICAg
ICAgZ3N0X2J1c19yZW1vdmVfc2lnbmFsX3dhdGNoKGJ1cy5nZXQoKSk7CiAKICAgICAgICAgZ3N0
X2VsZW1lbnRfc2V0X3N0YXRlKG1fcGlwZWxpbmUsIEdTVF9TVEFURV9OVUxMKTsKICAgICAgICAg
Z3N0X29iamVjdF91bnJlZihHU1RfT0JKRUNUKG1fcGlwZWxpbmUpKTsKQEAgLTE3MywxMiArMTcz
LDEzIEBAIEdzdEZsb3dSZXR1cm4gQXVkaW9GaWxlUmVhZGVyOjpoYW5kbGVTYW1wbGUoR3N0QXBw
U2luayogc2luaykKIAogICAgIEdzdEF1ZGlvSW5mbyBpbmZvOwogICAgIGdzdF9hdWRpb19pbmZv
X2Zyb21fY2FwcygmaW5mbywgY2Fwcyk7Ci0gICAgaW50IGZyYW1lcyA9IEdTVF9DTE9DS19USU1F
X1RPX0ZSQU1FUyhHU1RfQlVGRkVSX0RVUkFUSU9OKGJ1ZmZlciksIEdTVF9BVURJT19JTkZPX1JB
VEUoJmluZm8pKTsKKyAgICBpbnQgZnJhbWVzID0gZ3N0X2J1ZmZlcl9nZXRfc2l6ZShidWZmZXIp
IC8gaW5mby5icGY7CiAKICAgICAvLyBDaGVjayB0aGUgZmlyc3QgYXVkaW8gY2hhbm5lbC4gVGhl
IGJ1ZmZlciBpcyBzdXBwb3NlZCB0byBzdG9yZQogICAgIC8vIGRhdGEgb2YgYSBzaW5nbGUgY2hh
bm5lbCBhbnl3YXkuCiAgICAgc3dpdGNoIChHU1RfQVVESU9fSU5GT19QT1NJVElPTigmaW5mbywg
MCkpIHsKICAgICBjYXNlIEdTVF9BVURJT19DSEFOTkVMX1BPU0lUSU9OX0ZST05UX0xFRlQ6Cisg
ICAgY2FzZSBHU1RfQVVESU9fQ0hBTk5FTF9QT1NJVElPTl9NT05POgogICAgICAgICBnc3RfYnVm
ZmVyX2xpc3RfYWRkKG1fZnJvbnRMZWZ0QnVmZmVycywgZ3N0X2J1ZmZlcl9yZWYoYnVmZmVyKSk7
CiAgICAgICAgIG1fY2hhbm5lbFNpemUgKz0gZnJhbWVzOwogICAgICAgICBicmVhazsKQEAgLTE5
MSw3ICsxOTIsNiBAQCBHc3RGbG93UmV0dXJuIEF1ZGlvRmlsZVJlYWRlcjo6aGFuZGxlU2FtcGxl
KEdzdEFwcFNpbmsqIHNpbmspCiAKICAgICBnc3Rfc2FtcGxlX3VucmVmKHNhbXBsZSk7CiAgICAg
cmV0dXJuIEdTVF9GTE9XX09LOwotCiB9CiAKIGdib29sZWFuIEF1ZGlvRmlsZVJlYWRlcjo6aGFu
ZGxlTWVzc2FnZShHc3RNZXNzYWdlKiBtZXNzYWdlKQpAQCAtMjExLDYgKzIxMSw3IEBAIGdib29s
ZWFuIEF1ZGlvRmlsZVJlYWRlcjo6aGFuZGxlTWVzc2FnZShHc3RNZXNzYWdlKiBtZXNzYWdlKQog
ICAgICAgICBnc3RfbWVzc2FnZV9wYXJzZV9lcnJvcihtZXNzYWdlLCAmZXJyb3Iub3V0UHRyKCks
ICZkZWJ1Zy5vdXRQdHIoKSk7CiAgICAgICAgIGdfd2FybmluZygiRXJyb3I6ICVkLCAlcy4gRGVi
dWcgb3V0cHV0OiAlcyIsIGVycm9yLT5jb2RlLCAgZXJyb3ItPm1lc3NhZ2UsIGRlYnVnLmdldCgp
KTsKICAgICAgICAgbV9lcnJvck9jY3VycmVkID0gdHJ1ZTsKKyAgICAgICAgZ3N0X2VsZW1lbnRf
c2V0X3N0YXRlKG1fcGlwZWxpbmUsIEdTVF9TVEFURV9OVUxMKTsKICAgICAgICAgZ19tYWluX2xv
b3BfcXVpdChtX2xvb3AuZ2V0KCkpOwogICAgICAgICBicmVhazsKICAgICBkZWZhdWx0OgpAQCAt
MjQ0LDggKzI0NSw4IEBAIHZvaWQgQXVkaW9GaWxlUmVhZGVyOjpoYW5kbGVOZXdEZWludGVybGVh
dmVQYWQoR3N0UGFkKiBwYWQpCiAKICAgICBnc3RfZWxlbWVudF9saW5rX3BhZHNfZnVsbChxdWV1
ZSwgInNyYyIsIHNpbmssICJzaW5rIiwgR1NUX1BBRF9MSU5LX0NIRUNLX05PVEhJTkcpOwogCi0g
ICAgZ3N0X2VsZW1lbnRfc2V0X3N0YXRlKHF1ZXVlLCBHU1RfU1RBVEVfUkVBRFkpOwotICAgIGdz
dF9lbGVtZW50X3NldF9zdGF0ZShzaW5rLCBHU1RfU1RBVEVfUkVBRFkpOworICAgIGdzdF9lbGVt
ZW50X3N5bmNfc3RhdGVfd2l0aF9wYXJlbnQocXVldWUpOworICAgIGdzdF9lbGVtZW50X3N5bmNf
c3RhdGVfd2l0aF9wYXJlbnQoc2luayk7CiB9CiAKIHZvaWQgQXVkaW9GaWxlUmVhZGVyOjpkZWlu
dGVybGVhdmVQYWRzQ29uZmlndXJlZCgpCkBAIC0yNTcsNiArMjU4LDEwIEBAIHZvaWQgQXVkaW9G
aWxlUmVhZGVyOjpkZWludGVybGVhdmVQYWRzQ29uZmlndXJlZCgpCiAKIHZvaWQgQXVkaW9GaWxl
UmVhZGVyOjpwbHVnRGVpbnRlcmxlYXZlKEdzdFBhZCogcGFkKQogeworICAgIC8vIElnbm9yZSBh
bnkgYWRkaXRpb25hbCBzb3VyY2UgcGFkcyBqdXN0IGluIGNhc2UuCisgICAgaWYgKG1fZGVJbnRl
cmxlYXZlKQorICAgICAgICByZXR1cm47CisKICAgICAvLyBBIGRlY29kZWJpbiBwYWQgd2FzIGFk
ZGVkLCBwbHVnIGluIGEgZGVpbnRlcmxlYXZlIGVsZW1lbnQgdG8KICAgICAvLyBzZXBhcmF0ZSBl
YWNoIHBsYW5hciBjaGFubmVsLiBTdWIgcGlwZWxpbmUgbG9va3MgbGlrZQogICAgIC8vIC4uLiBk
ZWNvZGViaW4yICEgYXVkaW9jb252ZXJ0ICEgYXVkaW9yZXNhbXBsZSAhIGNhcHNmaWx0ZXIgISBk
ZWludGVybGVhdmUuCkBAIC0yNjksOSArMjc0LDEwIEBAIHZvaWQgQXVkaW9GaWxlUmVhZGVyOjpw
bHVnRGVpbnRlcmxlYXZlKEdzdFBhZCogcGFkKQogICAgIGdfc2lnbmFsX2Nvbm5lY3QobV9kZUlu
dGVybGVhdmUuZ2V0KCksICJwYWQtYWRkZWQiLCBHX0NBTExCQUNLKG9uR1N0cmVhbWVyRGVpbnRl
cmxlYXZlUGFkQWRkZWRDYWxsYmFjayksIHRoaXMpOwogICAgIGdfc2lnbmFsX2Nvbm5lY3QobV9k
ZUludGVybGVhdmUuZ2V0KCksICJuby1tb3JlLXBhZHMiLCBHX0NBTExCQUNLKG9uR1N0cmVhbWVy
RGVpbnRlcmxlYXZlUmVhZHlDYWxsYmFjayksIHRoaXMpOwogCi0gICAgR3N0Q2FwcyogY2FwcyA9
IGdzdF9jYXBzX25ld19zaW1wbGUoImF1ZGlvL3gtcmF3IiwgInJhdGUiLCBHX1RZUEVfSU5ULCBz
dGF0aWNfY2FzdDxpbnQ+KG1fc2FtcGxlUmF0ZSksCi0gICAgICAgICJjaGFubmVscyIsIEdfVFlQ
RV9JTlQsIDIsCi0gICAgICAgICJmb3JtYXQiLCBHX1RZUEVfU1RSSU5HLCBnc3RfYXVkaW9fZm9y
bWF0X3RvX3N0cmluZyhHU1RfQVVESU9fRk9STUFUX0YzMiksCisgICAgR3N0Q2FwcyogY2FwcyA9
IGdzdF9jYXBzX25ld19zaW1wbGUoImF1ZGlvL3gtcmF3IiwKKyAgICAgICAgInJhdGUiLCBHX1RZ
UEVfSU5ULCBzdGF0aWNfY2FzdDxpbnQ+KG1fc2FtcGxlUmF0ZSksCisgICAgICAgICJjaGFubmVs
cyIsIEdfVFlQRV9JTlQsIG1fY2hhbm5lbHMsCisgICAgICAgICJmb3JtYXQiLCBHX1RZUEVfU1RS
SU5HLCBHU1RfQVVESU9fTkUoRjMyKSwKICAgICAgICAgImxheW91dCIsIEdfVFlQRV9TVFJJTkcs
ICJpbnRlcmxlYXZlZCIsIG51bGxwdHIpOwogICAgIGdfb2JqZWN0X3NldChjYXBzRmlsdGVyLCAi
Y2FwcyIsIGNhcHMsIE5VTEwpOwogICAgIGdzdF9jYXBzX3VucmVmKGNhcHMpOwpAQCAtMzE5LDEy
ICszMjUsMjAgQEAgdm9pZCBBdWRpb0ZpbGVSZWFkZXI6OmRlY29kZUF1ZGlvRm9yQnVzQ3JlYXRp
b24oKQogCiAgICAgZ3N0X2Jpbl9hZGRfbWFueShHU1RfQklOKG1fcGlwZWxpbmUpLCBzb3VyY2Us
IG1fZGVjb2RlYmluLmdldCgpLCBOVUxMKTsKICAgICBnc3RfZWxlbWVudF9saW5rX3BhZHNfZnVs
bChzb3VyY2UsICJzcmMiLCBtX2RlY29kZWJpbi5nZXQoKSwgInNpbmsiLCBHU1RfUEFEX0xJTktf
Q0hFQ0tfTk9USElORyk7Ci0gICAgZ3N0X2VsZW1lbnRfc2V0X3N0YXRlKG1fcGlwZWxpbmUsIEdT
VF9TVEFURV9QQVVTRUQpOworCisgICAgLy8gQ2F0Y2ggZXJyb3JzIGhlcmUgaW1tZWRpYXRlbHks
IHRoZXJlIG1pZ2h0IG5vdCBiZSBhbiBlcnJvciBtZXNzYWdlIGlmCisgICAgLy8gd2UncmUgdW5s
dWNreS4KKyAgICBpZiAoZ3N0X2VsZW1lbnRfc2V0X3N0YXRlKG1fcGlwZWxpbmUsIEdTVF9TVEFU
RV9QQVVTRUQpID09IEdTVF9TVEFURV9DSEFOR0VfRkFJTFVSRSkgeworICAgICAgICBnX3dhcm5p
bmcoIkVycm9yOiBGYWlsZWQgdG8gc2V0IHBpcGVsaW5lIHRvIFBBVVNFRCIpOworICAgICAgICBt
X2Vycm9yT2NjdXJyZWQgPSB0cnVlOworICAgICAgICBnX21haW5fbG9vcF9xdWl0KG1fbG9vcC5n
ZXQoKSk7CisgICAgfQogfQogCiBQYXNzUmVmUHRyPEF1ZGlvQnVzPiBBdWRpb0ZpbGVSZWFkZXI6
OmNyZWF0ZUJ1cyhmbG9hdCBzYW1wbGVSYXRlLCBib29sIG1peFRvTW9ubykKIHsKICAgICBtX3Nh
bXBsZVJhdGUgPSBzYW1wbGVSYXRlOworICAgIG1fY2hhbm5lbHMgPSBtaXhUb01vbm8gPyAxIDog
MjsKIAogICAgIG1fZnJvbnRMZWZ0QnVmZmVycyA9IGdzdF9idWZmZXJfbGlzdF9uZXcoKTsKICAg
ICBtX2Zyb250UmlnaHRCdWZmZXJzID0gZ3N0X2J1ZmZlcl9saXN0X25ldygpOwpAQCAtMzQwLDEx
ICszNTQsMTQgQEAgUGFzc1JlZlB0cjxBdWRpb0J1cz4gQXVkaW9GaWxlUmVhZGVyOjpjcmVhdGVC
dXMoZmxvYXQgc2FtcGxlUmF0ZSwgYm9vbCBtaXhUb01vbm8KICAgICBnX21haW5fbG9vcF9ydW4o
bV9sb29wLmdldCgpKTsKICAgICBnX21haW5fY29udGV4dF9wb3BfdGhyZWFkX2RlZmF1bHQoY29u
dGV4dC5nZXQoKSk7CiAKKyAgICAvLyBTZXQgcGlwZWxpbmUgdG8gR1NUX1NUQVRFX05VTEwgc3Rh
dGUgaGVyZSBhbHJlYWR5IEFTQVAgdG8KKyAgICAvLyByZWxlYXNlIGFueSByZXNvdXJjZXMgdGhh
dCBtaWdodCBzdGlsbCBiZSB1c2VkLgorICAgIGdzdF9lbGVtZW50X3NldF9zdGF0ZShtX3BpcGVs
aW5lLCBHU1RfU1RBVEVfTlVMTCk7CisKICAgICBpZiAobV9lcnJvck9jY3VycmVkKQogICAgICAg
ICByZXR1cm4gMDsKIAotICAgIHVuc2lnbmVkIGNoYW5uZWxzID0gbWl4VG9Nb25vID8gMSA6IDI7
Ci0gICAgUmVmUHRyPEF1ZGlvQnVzPiBhdWRpb0J1cyA9IEF1ZGlvQnVzOjpjcmVhdGUoY2hhbm5l
bHMsIG1fY2hhbm5lbFNpemUsIHRydWUpOworICAgIFJlZlB0cjxBdWRpb0J1cz4gYXVkaW9CdXMg
PSBBdWRpb0J1czo6Y3JlYXRlKG1fY2hhbm5lbHMsIG1fY2hhbm5lbFNpemUsIHRydWUpOwogICAg
IGF1ZGlvQnVzLT5zZXRTYW1wbGVSYXRlKG1fc2FtcGxlUmF0ZSk7CiAKICAgICBjb3B5R3N0cmVh
bWVyQnVmZmVyc1RvQXVkaW9DaGFubmVsKG1fZnJvbnRMZWZ0QnVmZmVycywgYXVkaW9CdXMtPmNo
YW5uZWwoMCkpOwo=
</data>

          </attachment>
      

    </bug>

</bugzilla>