66718 2004-10-07 19:24 0000 atanks patches 2004-11-20 00:16:22 0000 1 1 1 Unclassified Gentoo Linux Games unspecified All Linux RESOLVED FIXED P2 normal --- 1 basic@mozdev.org games@gentoo.org basic@mozdev.org 2004-10-07 19:24:32 0000 I have 2 patches for atanks, 1) for the crasher when meteor shower and lightning options are turned on. Not sure if I got them all, but I've yet to get atanks to crash with this patch. 2) for the upper and lower limits of "money", that is to get it not to overflow when going beyond the limits. Reproducible: Always Steps to Reproduce: basic@mozdev.org 2004-10-07 19:25:45 0000 Created an attachment (id=41333) crash patch this is the patch for the crasher bug basic@mozdev.org 2004-10-07 19:27:06 0000 Created an attachment (id=41334) money overflow patch this is the money overflow patch basic@mozdev.org 2004-10-10 13:16:00 0000 Created an attachment (id=41481) crash patch v2 more null checks basic@mozdev.org 2004-10-10 13:18:02 0000 Created an attachment (id=41482) money overflow patch use 0 as the lower limit rather than LONG_MIN and more complete upper limit check mr_bones_@gentoo.org 2004-11-20 00:16:22 0000 added to CVS. resync and remerge to get them. Thanks for the bug report and patches. 41333 2004-10-07 19:25 0000 crash patch null_player.patch text/plain SW5kZXg6IHNyYy9leHBsb3Npb24uY2MKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2N2c3Jvb3QvYXRh bmtzL2F0YW5rcy9zcmMvZXhwbG9zaW9uLmNjLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjEyCmRp ZmYgLXUgLXIxLjEyIGV4cGxvc2lvbi5jYwotLS0gc3JjL2V4cGxvc2lvbi5jYwkxIEZlYiAyMDA0 IDIzOjI5OjI4IC0wMDAwCTEuMTIKKysrIHNyYy9leHBsb3Npb24uY2MJOCBPY3QgMjAwNCAwMjox MTozNSAtMDAwMApAQCAtMTU5LDcgKzE1OSw3IEBACiAJCQkJfQogCQkJCWlmIChkaXN0YW5jZSA8 PSAocmFkaXVzICsgVEFOS0hFSUdIVC8yKSAmJiB0YW5rLT5sID4gMCkgewogCQkJCQlfZ2xvYmFs LT51cGRhdGVNZW51ID0gMTsKLQkJCQkJdGFuay0+ZGFtYWdlID0gKGludCkgKChmbG9hdCkgZGFt YWdlICogKChmbG9hdCkgMSAtICgoZmFicyAoZGlzdGFuY2UpIC8gKGZsb2F0KXJhZGl1cykgLyAy KSkgKiBwbGF5ZXItPmRhbWFnZU11bHRpcGxpZXIpOworCQkJCQl0YW5rLT5kYW1hZ2UgPSAoaW50 KSAoKHBsYXllciA/IChmbG9hdCkgZGFtYWdlICogcGxheWVyLT5kYW1hZ2VNdWx0aXBsaWVyIDog KGZsb2F0KSBkYW1hZ2UpICogKChmbG9hdCkgMSAtICgoZmFicyAoZGlzdGFuY2UpIC8gKGZsb2F0 KXJhZGl1cykgLyAyKSkpOwogCiAJCQkJCXRhbmstPmNyZWRpdFRvID0gcGxheWVyOwogCQkJCQl0 YW5rLT5hcHBseURhbWFnZSAoKTsKSW5kZXg6IHNyYy9iZWFtLmNjCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZp bGU6IC9jdnNyb290L2F0YW5rcy9hdGFua3Mvc3JjL2JlYW0uY2MsdgpyZXRyaWV2aW5nIHJldmlz aW9uIDEuNgpkaWZmIC11IC1yMS42IGJlYW0uY2MKLS0tIHNyYy9iZWFtLmNjCTQgRmViIDIwMDQg MjM6MzQ6MzMgLTAwMDAJMS42CisrKyBzcmMvYmVhbS5jYwk4IE9jdCAyMDA0IDAyOjExOjM2IC0w MDAwCkBAIC0xNjcsNyArMTY3LDcgQEAKIAkJaWYgKHRhcmdldFggPiBsdGFuay0+eCAtIFRBTktX SURUSCAtIHJhZGl1cyAmJiB0YXJnZXRYIDwgbHRhbmstPnggKyBUQU5LV0lEVEggKyByYWRpdXMg JiYgdGFyZ2V0WSA+IGx0YW5rLT55IC0gcmFkaXVzICYmIHRhcmdldFkgPCBsdGFuay0+eSArIFRB TktIRUlHSFQgKyByYWRpdXMgJiYgbHRhbmstPmwgPiAwKSB7CiAJCQkvL2hpdFNvbWV0aGluZyA9 IDE7CiAJCQlsdGFuay0+cmVxdWlyZVVwZGF0ZSAoKTsKLQkJCWx0YW5rLT5kYW1hZ2UgKz0gZGFt YWdlICogcGxheWVyLT5kYW1hZ2VNdWx0aXBsaWVyOworCQkJbHRhbmstPmRhbWFnZSArPSBwbGF5 ZXIgPyBkYW1hZ2UgKiBwbGF5ZXItPmRhbWFnZU11bHRpcGxpZXIgOiBkYW1hZ2U7CiAJCQlsdGFu ay0+Y3JlZGl0VG8gPSBwbGF5ZXI7CiAJCQlpZiAoZGVzdHJveSkKIAkJCQlsdGFuay0+YXBwbHlE YW1hZ2UgKCk7Cg== 41334 2004-10-07 19:27 0000 money overflow patch limit.patch text/plain SW5kZXg6IHNyYy9hdGFua3MuY2MKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2N2c3Jvb3QvYXRhbmtz L2F0YW5rcy9zcmMvYXRhbmtzLmNjLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjU3CmRpZmYgLXUg LXIxLjU3IGF0YW5rcy5jYwotLS0gc3JjL2F0YW5rcy5jYwk0IEZlYiAyMDA0IDIzOjM0OjMzIC0w MDAwCTEuNTcKKysrIHNyYy9hdGFua3MuY2MJOCBPY3QgMjAwNCAwMTo0ODoyNiAtMDAwMApAQCAt MTU3NCw3ICsxNTc0LDggQEAKIAlmaSA9IGdsb2JhbC0+c3RvcHdpbmRvdyA9IHVwZGF0ZW5hbWUg PSBzY3JvbGwgPSAxOwogCWlmIChnbG9iYWwtPmN1cnJlbnRyb3VuZCAhPSBnbG9iYWwtPnJvdW5k cykgewogCQlmb3IgKHogPSAwOyB6IDwgZ2xvYmFsLT5udW1QbGF5ZXJzOyB6KyspIHsKLQkJCWds b2JhbC0+cGxheWVyc1t6XS0+bW9uZXkgPSAobG9uZyBpbnQpIChnbG9iYWwtPnBsYXllcnNbel0t Pm1vbmV5ICogZ2xvYmFsLT5pbnRlcmVzdCk7CisJCQlkb3VibGUgbW9uZXkgPSBnbG9iYWwtPnBs YXllcnNbel0tPm1vbmV5ICogZ2xvYmFsLT5pbnRlcmVzdDsKKwkJCWdsb2JhbC0+cGxheWVyc1t6 XS0+bW9uZXkgPSAobW9uZXkgPCBMT05HX01BWCA/IChsb25nIGludCkgbW9uZXkgOiBMT05HX01B WCk7CiAJCX0KIAl9CiAKQEAgLTI3NjMsMTAgKzI3NjQsMTMgQEAKIAkJCQkJaWYgKGx0YW5rLT5s IDw9IDAgJiYgIWFueUV4cGxvZGluZykgewogCQkJCQkJbHRhbmstPmV4cGxvZGUgKCk7CiAJCQkJ CQlpZiAobHRhbmstPmNyZWRpdFRvKSB7CisJCQkJCQkJZG91YmxlIG1vbmV5OwogCQkJCQkJCWlm IChsdGFuay0+cGxheWVyICE9IGx0YW5rLT5jcmVkaXRUbykgewkvL2VuZW15IGRlc3Ryb3llZAot CQkJCQkJCQlsdGFuay0+Y3JlZGl0VG8tPm1vbmV5ICs9IChpbnQpZ2xvYmFsLT5zY29yZVVuaXRE ZXN0cm95Qm9udXM7CisJCQkJCQkJCW1vbmV5ID0gbHRhbmstPmNyZWRpdFRvLT5tb25leSArIGds b2JhbC0+c2NvcmVVbml0RGVzdHJveUJvbnVzOworCQkJCQkJCQlsdGFuay0+Y3JlZGl0VG8tPm1v bmV5ID0gKG1vbmV5IDwgTE9OR19NQVggPyAobG9uZyBpbnQpbW9uZXkgOiBMT05HX01BWCk7CiAJ CQkJCQkJfSBlbHNlIHsJLy9zZWxmIGRlc3Ryb3kgLSB1Z2ggZm9vbGlzaCBvbmUgOikpCi0JCQkJ CQkJCWx0YW5rLT5jcmVkaXRUby0+bW9uZXkgLT0gKGludClnbG9iYWwtPnNjb3JlVW5pdFNlbGZE ZXN0cm95OworCQkJCQkJCQltb25leSA9IGx0YW5rLT5jcmVkaXRUby0+bW9uZXkgLSBnbG9iYWwt PnNjb3JlVW5pdFNlbGZEZXN0cm95OworCQkJCQkJCQlsdGFuay0+Y3JlZGl0VG8tPm1vbmV5ID0g KG1vbmV5ID4gTE9OR19NSU4gPyAobG9uZyBpbnQpbW9uZXkgOiBMT05HX01JTik7CiAJCQkJCQkJ fQogCQkJCQkJCWx0YW5rLT5jcmVkaXRUbyA9IE5VTEw7CiAJCQkJCQl9CkBAIC0yODA4LDcgKzI4 MTIsOCBAQAogCQkJCQkJCQlpZiAod2lubmVyID49IDApIHsKIAkJCQkJCQkJCWdsb2JhbC0+cGxh eWVyc1t3aW5uZXJdLT5zY29yZSsrOwogCQkJCQkJCQkJZ2xvYmFsLT5wbGF5ZXJzW3dpbm5lcl0t PndvbisrOwotCQkJCQkJCQkJZ2xvYmFsLT5wbGF5ZXJzW3dpbm5lcl0tPm1vbmV5ICs9IChsb25n IGludClnbG9iYWwtPnNjb3JlUm91bmRXaW5Cb251czsKKwkJCQkJCQkJCWRvdWJsZSBtb25leSA9 IGdsb2JhbC0+cGxheWVyc1t3aW5uZXJdLT5tb25leSArIGdsb2JhbC0+c2NvcmVSb3VuZFdpbkJv bnVzOworCQkJCQkJCQkJZ2xvYmFsLT5wbGF5ZXJzW3dpbm5lcl0tPm1vbmV5ID0gKG1vbmV5IDwg TE9OR19NQVggPyAobG9uZyBpbnQpIG1vbmV5IDogTE9OR19NQVgpOwogCQkJCQkJCQl9CiAJCQkJ CQkJCWJDb3VudCA9IDA7CiAJCQkJCQkJCWdsb2JhbC0+dXBkYXRlTWVudSA9IDE7Cg== 41481 2004-10-10 13:16 0000 crash patch v2 null_player.patch text/plain SW5kZXg6IHNyYy9leHBsb3Npb24uY2MKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2N2c3Jvb3QvYXRh bmtzL2F0YW5rcy9zcmMvZXhwbG9zaW9uLmNjLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjEyCmRp ZmYgLXUgLXIxLjEyIGV4cGxvc2lvbi5jYwotLS0gc3JjL2V4cGxvc2lvbi5jYwkxIEZlYiAyMDA0 IDIzOjI5OjI4IC0wMDAwCTEuMTIKKysrIHNyYy9leHBsb3Npb24uY2MJMTAgT2N0IDIwMDQgMjA6 MTQ6MDMgLTAwMDAKQEAgLTE1OSw3ICsxNTksNyBAQAogCQkJCX0KIAkJCQlpZiAoZGlzdGFuY2Ug PD0gKHJhZGl1cyArIFRBTktIRUlHSFQvMikgJiYgdGFuay0+bCA+IDApIHsKIAkJCQkJX2dsb2Jh bC0+dXBkYXRlTWVudSA9IDE7Ci0JCQkJCXRhbmstPmRhbWFnZSA9IChpbnQpICgoZmxvYXQpIGRh bWFnZSAqICgoZmxvYXQpIDEgLSAoKGZhYnMgKGRpc3RhbmNlKSAvIChmbG9hdClyYWRpdXMpIC8g MikpICogcGxheWVyLT5kYW1hZ2VNdWx0aXBsaWVyKTsKKwkJCQkJdGFuay0+ZGFtYWdlID0gKGlu dCkgKChwbGF5ZXIgPyAoZmxvYXQpIGRhbWFnZSAqIHBsYXllci0+ZGFtYWdlTXVsdGlwbGllciA6 IChmbG9hdCkgZGFtYWdlKSAqICgoZmxvYXQpIDEgLSAoKGZhYnMgKGRpc3RhbmNlKSAvIChmbG9h dClyYWRpdXMpIC8gMikpKTsKIAogCQkJCQl0YW5rLT5jcmVkaXRUbyA9IHBsYXllcjsKIAkJCQkJ dGFuay0+YXBwbHlEYW1hZ2UgKCk7CkBAIC0yNTMsNyArMjUzLDcgQEAKIAkJaWYgKGEgPiAxICYm IGEgPD0gRVhQTE9ERUZSQU1FUyArIDEpIHsKIAkJCWludCBzdGFydENpcmMgPSAocmFkaXVzIC8g RVhQTE9ERUZSQU1FUykgKiBhOwogCQkJY2lyY2xlZmlsbCAoX2Vudi0+dGVycmFpbiwgKGludCl4 LCAoaW50KXksIHN0YXJ0Q2lyYywgUElOSyk7Ci0JCQljaXJjbGUgKGRlc3QsIChpbnQpeCwgKGlu dCl5LCBzdGFydENpcmMsIHBsYXllci0+Y29sb3IpOworCQkJY2lyY2xlIChkZXN0LCAoaW50KXgs IChpbnQpeSwgc3RhcnRDaXJjLCBwbGF5ZXIgPyBwbGF5ZXItPmNvbG9yIDogV0hJVEUpOwogCQkJ c2V0VXBkYXRlQXJlYSAoKGludCl4IC0gKHJhZGl1cyArIDEpLCAoaW50KXkgLSAocmFkaXVzICsg MSksIChyYWRpdXMgKyAxKSAqIDIsIChyYWRpdXMgKyAxKSAqIDIpOwogCQl9CiAJfSBlbHNlIGlm ICgodHlwZSA+PSBSSU9UX0NIQVJHRSkgJiYgKHR5cGUgPD0gUklPVF9CTEFTVCkpIHsKQEAgLTI2 MSw3ICsyNjEsNyBAQAogCQkJZG91YmxlIHN4ID0geCAtIF9nbG9iYWwtPnNsb3BlW2FuZ2xlXVsw XSAqIDE1OwogCQkJZG91YmxlIHN5ID0geSAtIF9nbG9iYWwtPnNsb3BlW2FuZ2xlXVsxXSAqIDE1 OwogCQkJaW50IHN0YXJ0Q2lyYyA9IChyYWRpdXMgLyBFWFBMT0RFRlJBTUVTKSAqIGE7Ci0JCQl0 cmlhbmdsZSAoZGVzdCwgKGludClzeCwgKGludClzeSwgKGludCkoc3ggKyBfZ2xvYmFsLT5zbG9w ZVsoYW5nbGUgKyA0NSkgJSAzNjBdWzBdICogc3RhcnRDaXJjKSwgKGludCkoc3kgKyBfZ2xvYmFs LT5zbG9wZVsoYW5nbGUgKyA0NSkgJSAzNjBdWzFdICogc3RhcnRDaXJjKSwoaW50KShzeCArIF9n bG9iYWwtPnNsb3BlWyhhbmdsZSArIDMxNSkgJSAzNjBdWzBdICogc3RhcnRDaXJjKSwoaW50KShz eSArIF9nbG9iYWwtPnNsb3BlWyhhbmdsZSArIDMxNSkgJSAzNjBdWzFdICogc3RhcnRDaXJjKSwg cGxheWVyLT5jb2xvcik7CisJCQl0cmlhbmdsZSAoZGVzdCwgKGludClzeCwgKGludClzeSwgKGlu dCkoc3ggKyBfZ2xvYmFsLT5zbG9wZVsoYW5nbGUgKyA0NSkgJSAzNjBdWzBdICogc3RhcnRDaXJj KSwgKGludCkoc3kgKyBfZ2xvYmFsLT5zbG9wZVsoYW5nbGUgKyA0NSkgJSAzNjBdWzFdICogc3Rh cnRDaXJjKSwoaW50KShzeCArIF9nbG9iYWwtPnNsb3BlWyhhbmdsZSArIDMxNSkgJSAzNjBdWzBd ICogc3RhcnRDaXJjKSwoaW50KShzeSArIF9nbG9iYWwtPnNsb3BlWyhhbmdsZSArIDMxNSkgJSAz NjBdWzFdICogc3RhcnRDaXJjKSwgcGxheWVyID8gcGxheWVyLT5jb2xvciA6IFdISVRFKTsKIAkJ CXNldFVwZGF0ZUFyZWEgKChpbnQpc3ggLSAoc3RhcnRDaXJjICsgMSksIChpbnQpc3kgLSAoc3Rh cnRDaXJjICsgMSksIChzdGFydENpcmMgKyAxKSAqIDIsIChzdGFydENpcmMgKyAxKSAqIDIpOwog CQl9CiAJfSBlbHNlIHsKSW5kZXg6IHNyYy9iZWFtLmNjCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9j dnNyb290L2F0YW5rcy9hdGFua3Mvc3JjL2JlYW0uY2MsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEu NgpkaWZmIC11IC1yMS42IGJlYW0uY2MKLS0tIHNyYy9iZWFtLmNjCTQgRmViIDIwMDQgMjM6MzQ6 MzMgLTAwMDAJMS42CisrKyBzcmMvYmVhbS5jYwkxMCBPY3QgMjAwNCAyMDoxNDowMyAtMDAwMApA QCAtMTY3LDcgKzE2Nyw3IEBACiAJCWlmICh0YXJnZXRYID4gbHRhbmstPnggLSBUQU5LV0lEVEgg LSByYWRpdXMgJiYgdGFyZ2V0WCA8IGx0YW5rLT54ICsgVEFOS1dJRFRIICsgcmFkaXVzICYmIHRh cmdldFkgPiBsdGFuay0+eSAtIHJhZGl1cyAmJiB0YXJnZXRZIDwgbHRhbmstPnkgKyBUQU5LSEVJ R0hUICsgcmFkaXVzICYmIGx0YW5rLT5sID4gMCkgewogCQkJLy9oaXRTb21ldGhpbmcgPSAxOwog CQkJbHRhbmstPnJlcXVpcmVVcGRhdGUgKCk7Ci0JCQlsdGFuay0+ZGFtYWdlICs9IGRhbWFnZSAq IHBsYXllci0+ZGFtYWdlTXVsdGlwbGllcjsKKwkJCWx0YW5rLT5kYW1hZ2UgKz0gcGxheWVyID8g ZGFtYWdlICogcGxheWVyLT5kYW1hZ2VNdWx0aXBsaWVyIDogZGFtYWdlOwogCQkJbHRhbmstPmNy ZWRpdFRvID0gcGxheWVyOwogCQkJaWYgKGRlc3Ryb3kpCiAJCQkJbHRhbmstPmFwcGx5RGFtYWdl ICgpOwo= 41482 2004-10-10 13:18 0000 money overflow patch limit.patch text/plain SW5kZXg6IHNyYy90YW5rLmNjCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9jdnNyb290L2F0YW5rcy9h dGFua3Mvc3JjL3RhbmsuY2MsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMjAKZGlmZiAtdSAtcjEu MjAgdGFuay5jYwotLS0gc3JjL3RhbmsuY2MJMSBGZWIgMjAwNCAyMzoyOToyOCAtMDAwMAkxLjIw CisrKyBzcmMvdGFuay5jYwkxMCBPY3QgMjAwNCAyMDoxMzoxOCAtMDAwMApAQCAtMTcxLDcgKzE3 MSw4IEBACiAJc2ggLT0gKGludClkYW1hZ2U7CiAJaWYgKGNyZWRpdFRvKSB7CiAJCWlmIChwbGF5 ZXIgIT0gY3JlZGl0VG8pIHsJLy9lbmVteSBoaXQgKysKLQkJCWNyZWRpdFRvLT5tb25leSArPSAo aW50KShkYW1hZ2UgKiBfZ2xvYmFsLT5zY29yZUhpdFVuaXQpOworCQkJZG91YmxlIG1vbmV5ID0g IGRhbWFnZSAqIF9nbG9iYWwtPnNjb3JlSGl0VW5pdDsKKwkJCWNyZWRpdFRvLT5tb25leSArPSAo bW9uZXkgPCBMT05HX01BWCA/IChpbnQpbW9uZXkgOiBMT05HX01BWCk7CiAJCQlpZiAoKGludClw bGF5ZXItPnR5cGUgIT0gSFVNQU5fUExBWUVSKSB7CiAJCQkJaWYgKHBsYXllci0+cmV2ZW5nZSA9 PSBjcmVkaXRUbykgewogCQkJCQlwbGF5ZXItPmFubm95YW5jZUZhY3RvciArPSBkYW1hZ2U7Cklu ZGV4OiBzcmMvYXRhbmtzLmNjCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9jdnNyb290L2F0YW5rcy9h dGFua3Mvc3JjL2F0YW5rcy5jYyx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS41NwpkaWZmIC11IC1y MS41NyBhdGFua3MuY2MKLS0tIHNyYy9hdGFua3MuY2MJNCBGZWIgMjAwNCAyMzozNDozMyAtMDAw MAkxLjU3CisrKyBzcmMvYXRhbmtzLmNjCTEwIE9jdCAyMDA0IDIwOjEzOjE4IC0wMDAwCkBAIC0x NTc0LDcgKzE1NzQsOCBAQAogCWZpID0gZ2xvYmFsLT5zdG9wd2luZG93ID0gdXBkYXRlbmFtZSA9 IHNjcm9sbCA9IDE7CiAJaWYgKGdsb2JhbC0+Y3VycmVudHJvdW5kICE9IGdsb2JhbC0+cm91bmRz KSB7CiAJCWZvciAoeiA9IDA7IHogPCBnbG9iYWwtPm51bVBsYXllcnM7IHorKykgewotCQkJZ2xv YmFsLT5wbGF5ZXJzW3pdLT5tb25leSA9IChsb25nIGludCkgKGdsb2JhbC0+cGxheWVyc1t6XS0+ bW9uZXkgKiBnbG9iYWwtPmludGVyZXN0KTsKKwkJCWRvdWJsZSBtb25leSA9IGdsb2JhbC0+cGxh eWVyc1t6XS0+bW9uZXkgKiBnbG9iYWwtPmludGVyZXN0OworCQkJZ2xvYmFsLT5wbGF5ZXJzW3pd LT5tb25leSA9IChtb25leSA8IExPTkdfTUFYID8gKGxvbmcgaW50KSBtb25leSA6IExPTkdfTUFY KTsKIAkJfQogCX0KIApAQCAtMjc2NCw5ICsyNzY1LDExIEBACiAJCQkJCQlsdGFuay0+ZXhwbG9k ZSAoKTsKIAkJCQkJCWlmIChsdGFuay0+Y3JlZGl0VG8pIHsKIAkJCQkJCQlpZiAobHRhbmstPnBs YXllciAhPSBsdGFuay0+Y3JlZGl0VG8pIHsJLy9lbmVteSBkZXN0cm95ZWQKLQkJCQkJCQkJbHRh bmstPmNyZWRpdFRvLT5tb25leSArPSAoaW50KWdsb2JhbC0+c2NvcmVVbml0RGVzdHJveUJvbnVz OworCQkJCQkJCQlkb3VibGUgbW9uZXkgPSBsdGFuay0+Y3JlZGl0VG8tPm1vbmV5ICsgZ2xvYmFs LT5zY29yZVVuaXREZXN0cm95Qm9udXM7CisJCQkJCQkJCWx0YW5rLT5jcmVkaXRUby0+bW9uZXkg PSAobW9uZXkgPCBMT05HX01BWCA/IChsb25nIGludCltb25leSA6IExPTkdfTUFYKTsKIAkJCQkJ CQl9IGVsc2UgewkvL3NlbGYgZGVzdHJveSAtIHVnaCBmb29saXNoIG9uZSA6KSkKIAkJCQkJCQkJ bHRhbmstPmNyZWRpdFRvLT5tb25leSAtPSAoaW50KWdsb2JhbC0+c2NvcmVVbml0U2VsZkRlc3Ry b3k7CisJCQkJCQkJCWlmIChsdGFuay0+Y3JlZGl0VG8tPm1vbmV5IDwgMCkgbHRhbmstPmNyZWRp dFRvLT5tb25leSA9IDA7CiAJCQkJCQkJfQogCQkJCQkJCWx0YW5rLT5jcmVkaXRUbyA9IE5VTEw7 CiAJCQkJCQl9CkBAIC0yODA4LDcgKzI4MTEsOCBAQAogCQkJCQkJCQlpZiAod2lubmVyID49IDAp IHsKIAkJCQkJCQkJCWdsb2JhbC0+cGxheWVyc1t3aW5uZXJdLT5zY29yZSsrOwogCQkJCQkJCQkJ Z2xvYmFsLT5wbGF5ZXJzW3dpbm5lcl0tPndvbisrOwotCQkJCQkJCQkJZ2xvYmFsLT5wbGF5ZXJz W3dpbm5lcl0tPm1vbmV5ICs9IChsb25nIGludClnbG9iYWwtPnNjb3JlUm91bmRXaW5Cb251czsK KwkJCQkJCQkJCWRvdWJsZSBtb25leSA9IGdsb2JhbC0+cGxheWVyc1t3aW5uZXJdLT5tb25leSAr IGdsb2JhbC0+c2NvcmVSb3VuZFdpbkJvbnVzOworCQkJCQkJCQkJZ2xvYmFsLT5wbGF5ZXJzW3dp bm5lcl0tPm1vbmV5ID0gKG1vbmV5IDwgTE9OR19NQVggPyAobG9uZyBpbnQpIG1vbmV5IDogTE9O R19NQVgpOwogCQkJCQkJCQl9CiAJCQkJCQkJCWJDb3VudCA9IDA7CiAJCQkJCQkJCWdsb2JhbC0+ dXBkYXRlTWVudSA9IDE7Cg==