From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 28452 invoked by alias); 24 May 2017 14:16:05 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: X-Seq: 41146 Received: (qmail 9547 invoked from network); 24 May 2017 14:16:05 -0000 X-Qmail-Scanner-Diagnostics: from aok120.rev.netart.pl by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.99.2/21882. spamassassin: 3.4.1. Clear:RC:0(85.128.245.120):SA:0(0.0/5.0):. Processed in 1.629164 secs); 24 May 2017 14:16:05 -0000 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=unavailable autolearn_force=no version=3.4.1 X-Envelope-From: psprint@zdharma.org X-Qmail-Scanner-Mime-Attachments: |gdbm_uplift.diff| X-Qmail-Scanner-Zip-Files: | Received-SPF: none (ns1.primenet.com.au: domain at zdharma.org does not designate permitted sender hosts) X-Virus-Scanned: by amavisd-new using ClamAV (8) Date: Wed, 24 May 2017 16:07:23 +0200 From: Sebastian Gniazdowski To: zsh-workers@zsh.org Message-ID: Subject: [PATCH] Update of db_gdbm module =?utf-8?Q?=E2=80=93_?=strict zsfree() usage, better main #ifdef X-Mailer: Airmail (231) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="5925939c_327b23c6_1a9" --5925939c_327b23c6_1a9 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Hello, when unmetafied string is returned, possibly containing nulls, zsfree() c= annot be used. There is probably a better way to solve this, but followin= g method for sure works: =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0/* =46ree key, restoring its original l= ength */ + =C2=A0 =C2=A0 =C2=A0 =C2=A0set=5Flength(umkey, umlen); =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0zsfree(umkey); +static void set=5Flength(char *buf, int size) =7B + =C2=A0 =C2=A0buf=5Bsize=5D=3D'=5C0'; + =C2=A0 =C2=A0while ( -- size >=3D 0 ) =7B + =C2=A0 =C2=A0 =C2=A0 =C2=A0buf=5Bsize=5D=3D' '; + =C2=A0 =C2=A0=7D +=7D Attached is a patch, tested with TESTNUM=3DV11. Would be nice if also=C2=A0= 40898 would be applied:=C2=A0http://www.zsh.org/mla/workers/2017/msg00568= .html -- Sebastian Gniazdowski psprint /at/ zdharma.org --5925939c_327b23c6_1a9 Content-Type: application/octet-stream Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="=?utf-8?Q?gdbm=5Fuplift.diff?=" ZGlmZiAtLWdpdCBhL1NyYy9Nb2R1bGVzL2RiX2dkYm0uYyBiL1NyYy9Nb2R1bGVzL2RiX2dkYm0u YwppbmRleCA1OTZhOGFlLi45ZjQ0MWJhIDEwMDY0NAotLS0gYS9TcmMvTW9kdWxlcy9kYl9nZGJt LmMKKysrIGIvU3JjL01vZHVsZXMvZGJfZ2RibS5jCkBAIC00MSw3ICs0MSw4IEBACiBzdGF0aWMg UGFyYW0gY3JlYXRlaGFzaCggY2hhciAqbmFtZSwgaW50IGZsYWdzICk7CiBzdGF0aWMgaW50IGFw cGVuZF90aWVkX25hbWUoIGNvbnN0IGNoYXIgKm5hbWUgKTsKIHN0YXRpYyBpbnQgcmVtb3ZlX3Rp ZWRfbmFtZSggY29uc3QgY2hhciAqbmFtZSApOwotY2hhciAqdW5tZXRhZnlfemFsbG9jKGNvbnN0 IGNoYXIgKnRvX2NvcHksIGludCAqbmV3X2xlbik7CitzdGF0aWMgY2hhciAqdW5tZXRhZnlfemFs bG9jKGNvbnN0IGNoYXIgKnRvX2NvcHksIGludCAqbmV3X2xlbik7CitzdGF0aWMgdm9pZCBzZXRf bGVuZ3RoKGNoYXIgKmJ1ZiwgaW50IHNpemUpOwogCiAvKgogICogTWFrZSBzdXJlIHdlIGhhdmUg YWxsIHRoZSBiaXRzIEknbSB1c2luZyBmb3IgbWVtb3J5IG1hcHBpbmcsIG90aGVyd2lzZQpAQCAt MzE5LDEzICszMjAsMTUgQEAgZ2RibWdldGZuKFBhcmFtIHBtKQogICAgICAgICBwbS0+dS5zdHIg PSBtZXRhZnkoY29udGVudC5kcHRyLCBjb250ZW50LmRzaXplLCBNRVRBX0RVUCk7CiAKICAgICAg ICAgLyogRnJlZSBrZXksIHJlc3RvcmluZyBpdHMgb3JpZ2luYWwgbGVuZ3RoICovCisgICAgICAg IHNldF9sZW5ndGgodW1rZXksIHVtbGVuKTsKICAgICAgICAgenNmcmVlKHVta2V5KTsKIAogICAg ICAgICAvKiBDYW4gcmV0dXJuIHBvaW50ZXIsIGNvcnJlY3RseSBzYXZlZCBpbnNpZGUgaGFzaCAq LwogICAgICAgICByZXR1cm4gcG0tPnUuc3RyOwogICAgIH0KIAotICAgIC8qIEZyZWUga2V5ICov CisgICAgLyogRnJlZSBrZXksIHJlc3RvcmluZyBpdHMgb3JpZ2luYWwgbGVuZ3RoICovCisgICAg c2V0X2xlbmd0aCh1bWtleSwgdW1sZW4pOwogICAgIHpzZnJlZSh1bWtleSk7CiAKICAgICAvKiBD YW4gdGhpcyBiZSAiIiA/ICovCkBAIC0zNzQsMTIgKzM3NywxNCBAQCBnZGJtc2V0Zm4oUGFyYW0g cG0sIGNoYXIgKnZhbCkKICAgICAgICAgICAgICh2b2lkKWdkYm1fc3RvcmUoZGJmLCBrZXksIGNv bnRlbnQsIEdEQk1fUkVQTEFDRSk7CiAKICAgICAgICAgICAgIC8qIEZyZWUgKi8KKyAgICAgICAg ICAgIHNldF9sZW5ndGgodW12YWwsIHVtbGVuKTsKICAgICAgICAgICAgIHpzZnJlZSh1bXZhbCk7 CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICAodm9pZClnZGJtX2RlbGV0ZShkYmYsIGtl eSk7CiAgICAgICAgIH0KIAogICAgICAgICAvKiBGcmVlIGtleSAqLworICAgICAgICBzZXRfbGVu Z3RoKHVta2V5LCBrZXkuZHNpemUpOwogICAgICAgICB6c2ZyZWUodW1rZXkpOwogICAgIH0KIH0K QEAgLTUxOCwxMCArNTIzLDEyIEBAIGdkYm1oYXNoc2V0Zm4oUGFyYW0gcG0sIEhhc2hUYWJsZSBo dCkKIAkgICAgY29udGVudC5kc2l6ZSA9IHVtbGVuOwogCSAgICAodm9pZClnZGJtX3N0b3JlKGRi Ziwga2V5LCBjb250ZW50LCBHREJNX1JFUExBQ0UpOwkKIAotICAgICAgICAgICAgLyogRnJlZSAt IHRoYW5rcyB0byB1bm1ldGFmeV96YWxsb2Mgc2l6ZSBvZgotICAgICAgICAgICAgICogdGhlIHN0 cmluZ3MgaXMgZXhhY3QgemFsbG9jIHNpemUgLSBjYW4KLSAgICAgICAgICAgICAqIHBhc3MgdG8g enNmcmVlICovCisgICAgICAgICAgICAvKiBGcmVlIC0gdW5tZXRhZnlfemFsbG9jIGFsbG9jYXRl cyBleGFjdCByZXF1aXJlZAorICAgICAgICAgICAgICogc3BhY2UsIGhvd2V2ZXIgdW5tZXRhZmll ZCBzdHJpbmcgY2FuIGhhdmUgemVyb3MKKyAgICAgICAgICAgICAqIGluIGNvbnRlbnQsIHNvIHdl IG11c3QgZmlyc3QgZmlsbCB3aXRoIG5vbi0wIGJ5dGVzICovCisgICAgICAgICAgICBzZXRfbGVu Z3RoKHVtdmFsLCBjb250ZW50LmRzaXplKTsKICAgICAgICAgICAgIHpzZnJlZSh1bXZhbCk7Cisg ICAgICAgICAgICBzZXRfbGVuZ3RoKHVta2V5LCBrZXkuZHNpemUpOwogICAgICAgICAgICAgenNm cmVlKHVta2V5KTsKIAogCSAgICB1bnF1ZXVlX3NpZ25hbHMoKTsKQEAgLTU3NiwxMCArNTgzLDYg QEAgZ2RibWhhc2h1bnNldGZuKFBhcmFtIHBtLCBVTlVTRUQoaW50IGV4cCkpCiAgICAgcG0tPm5v ZGUuZmxhZ3MgfD0gUE1fVU5TRVQ7CiB9CiAKLSNlbHNlCi0jIGVycm9yIG5vIGdkYm0KLSNlbmRp ZiAvKiBoYXZlIGdkYm0gKi8KLQogc3RhdGljIHN0cnVjdCBmZWF0dXJlcyBtb2R1bGVfZmVhdHVy ZXMgPSB7CiAgICAgYmludGFiLCBzaXplb2YoYmludGFiKS9zaXplb2YoKmJpbnRhYiksCiAgICAg TlVMTCwgMCwKQEAgLTc0NSw3ICs3NDgsNyBAQCBzdGF0aWMgaW50IHJlbW92ZV90aWVkX25hbWUo IGNvbnN0IGNoYXIgKm5hbWUgKSB7CiAgKgogICogTm8genNmcmVlKCktY29uZnVzaW5nIHN0cmlu ZyB3aWxsIGJlIHByb2R1Y2VkLgogICovCi1jaGFyICp1bm1ldGFmeV96YWxsb2MoY29uc3QgY2hh ciAqdG9fY29weSwgaW50ICpuZXdfbGVuKSB7CitzdGF0aWMgY2hhciAqdW5tZXRhZnlfemFsbG9j KGNvbnN0IGNoYXIgKnRvX2NvcHksIGludCAqbmV3X2xlbikgewogICAgIGNoYXIgKndvcmssICp0 b19yZXR1cm47CiAgICAgaW50IG15X25ld19sZW4gPSAwOwogCkBAIC03NjYsMyArNzY5LDE5IEBA IGNoYXIgKnVubWV0YWZ5X3phbGxvYyhjb25zdCBjaGFyICp0b19jb3B5LCBpbnQgKm5ld19sZW4p IHsKIAogICAgIHJldHVybiB0b19yZXR1cm47CiB9CisKKy8qCisgKiBGb3IgenNoLWFsbG9jYXRv ciwgcmVzdCBvZiBac2ggc2VlbXMgdG8gdXNlCisgKiBmcmVlKCkgaW5zdGVhZCBvZiB6c2ZyZWUo KSwgYW5kIHN1Y2ggbGVuZ3RoCisgKiByZXN0b3JhdGlvbiBjYXVzZXMgc2xvd2Rvd24sIGJ1dCBh bGwgaXMgdGhpcworICogd2F5IHN0cmljdCAtIGNvcnJlY3QgKi8KK3N0YXRpYyB2b2lkIHNldF9s ZW5ndGgoY2hhciAqYnVmLCBpbnQgc2l6ZSkgeworICAgIGJ1ZltzaXplXT0nXDAnOworICAgIHdo aWxlICggLS0gc2l6ZSA+PSAwICkgeworICAgICAgICBidWZbc2l6ZV09JyAnOworICAgIH0KK30K KworI2Vsc2UKKyMgZXJyb3Igbm8gZ2RibQorI2VuZGlmIC8qIGhhdmUgZ2RibSAqLwo= --5925939c_327b23c6_1a9--