From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from [87.239.111.99] (localhost [127.0.0.1]) by dev.tarantool.org (Postfix) with ESMTP id BA9206EC55; Mon, 26 Jul 2021 23:11:45 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org BA9206EC55 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1627330305; bh=+Y2Yg018nYXlXi3x1QBTx70yt38yo4jwGEku6B06MWI=; h=To:Cc:References:Date:In-Reply-To:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=UrcIuRaAN8pueHX9Hghe7Dz54XA9+I7wyX3LzX2ieV/JTn6foaRMpJaWQ79uc1XJQ 6cAq7NWleK/+ID+lnDh2m2pBkfKW8HyxHjf2iK50yds0+89l33MOY5JWJLEr3SNCNB TTDehMBxnlscDt9w0IOtNDIjKxJa0fEezFeeUZrg= Received: from smtpng2.i.mail.ru (smtpng2.i.mail.ru [94.100.179.3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 5C2AC6EC55 for ; Mon, 26 Jul 2021 23:11:44 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 5C2AC6EC55 Received: by smtpng2.m.smailru.net with esmtpa (envelope-from ) id 1m86wx-0001BT-MS; Mon, 26 Jul 2021 23:11:44 +0300 To: imeevma@tarantool.org Cc: tarantool-patches@dev.tarantool.org References: <894e6f0fb325f06b802b462615f7d1cd1b2c0a5f.1626880058.git.imeevma@gmail.com> Message-ID: <5e432ccf-58ad-60cf-9506-2574c280539b@tarantool.org> Date: Mon, 26 Jul 2021 22:11:42 +0200 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:78.0) Gecko/20100101 Thunderbird/78.12.0 MIME-Version: 1.0 In-Reply-To: <894e6f0fb325f06b802b462615f7d1cd1b2c0a5f.1626880058.git.imeevma@gmail.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-7564579A: 78E4E2B564C1792B X-77F55803: 4F1203BC0FB41BD941C43E597735A9C34755E0A9F196FCB739C645213AB7C8E0182A05F53808504045FE6E0C158AF39150FBFCF4B41C9F8312ADCCED0542B29B5961B89D3231F66D X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE75DF2B1F23425CAE5EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006373D58C44ED3182E498638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8C6F015760F541DA057A4A76619FFC08B117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCF1175FABE1C0F9B6A471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD182CC0D3CB04F14752D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B613439FA09F3DCB32089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: 0D63561A33F958A5B0C64EFF832964CABFB358DDB9072259502C8D3E7DE9AA1DD59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA7517A45118377F5F9E8E8E86DC7131B365E7726E8460B7C23C X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34EA882B598A20981119312D1965B97BEEFE6870113B75E48F803BCF067390834AAE364BD58D02906D1D7E09C32AA3244CA2E6EC7E3B6C415631E055C64D34E738FE8DA44ABE2443F7729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojMEANdStWW5/iDTlnW1yLKA== X-Mailru-Sender: 689FA8AB762F7393C37E3C1AEC41BA5D651668F952C210825284CF41EA4562E23841015FED1DE5223CC9A89AB576DD93FB559BB5D741EB963CF37A108A312F5C27E8A8C3839CE0E267EA787935ED9F1B X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH v1 1/2] sql: disallow explicit cast of BOOLEAN to number X-BeenThere: tarantool-patches@dev.tarantool.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Vladislav Shpilevoy via Tarantool-patches Reply-To: Vladislav Shpilevoy Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Thanks for the patch! See 2 comments below. > diff --git a/src/box/sql/mem.c b/src/box/sql/mem.c > index 6b95e41d3..5c44bfdfc 100644 > --- a/src/box/sql/mem.c > +++ b/src/box/sql/mem.c > @@ -683,24 +674,23 @@ str_to_bool(struct Mem *mem) > { > assert(mem->type == MEM_TYPE_STR); > char *str = mem->z; > + uint32_t len = mem->n; > bool b; > const char *str_true = "TRUE"; > const char *str_false = "FALSE"; > uint32_t len_true = strlen(str_true); > uint32_t len_false = strlen(str_false); > > - for (; str[0] == ' '; str++); > - if (strncasecmp(str, str_true, len_true) == 0) { > + for (; isspace(str[0]); str++, len--); > + for (; isspace(str[len - 1]); len--); > + if (len != len_true && len != len_false) > + return -1; > + > + if (len == len_true && strncasecmp(str, str_true, len) == 0) > b = true; > - str += len_true; > - } else if (strncasecmp(str, str_false, len_false) == 0) { > + else if (len == len_false && strncasecmp(str, str_false, len) == 0) > b = false; > - str += len_false; > - } else { > - return -1; > - } > - for (; str[0] == ' '; str++); > - if (str[0] != '\0') > + else > return -1; 1. Why did you change str_to_bool() if the patch is only about numbers <-> bool? > mem_set_bool(mem, b); > return 0; > @@ -1074,19 +1036,11 @@ mem_cast_explicit(struct Mem *mem, enum field_type type) > case FIELD_TYPE_INTEGER: > return mem_to_int(mem); > case FIELD_TYPE_BOOLEAN: > - switch (mem->type) { > - case MEM_TYPE_BOOL: > + if (mem->type == MEM_TYPE_BOOL) > return 0; > - case MEM_TYPE_INT: > - case MEM_TYPE_UINT: > - return int_to_bool(mem); > - case MEM_TYPE_STR: > + if (mem->type == MEM_TYPE_STR) > return str_to_bool(mem); > - case MEM_TYPE_DOUBLE: > - return double_to_bool(mem); > - default: > - return -1; 2. I would propose to keep the switch-case. Otherwise you are going to jump back and forth between if and switch when these places will be changed again.