# [PATCH 0/2] create FLEX_ALLOC_MEM to FLEX_ALLOC_STR cocci rule 4 messages from 2019-04-03 to 2019-04-04. Participants: Denton Liu, Jeff King. Thread: https://gitlist.dev/t/50869 ## Denton Liu, 2019-04-03 22:00 Subject: [PATCH 0/2] create FLEX_ALLOC_MEM to FLEX_ALLOC_STR cocci rule Message-ID: URL: https://gitlist.dev/e/cover.1554328261.git.liu.denton%40gmail.com ``` I was playing around with coccinelle and I noticed that we have a use of FLEX_ALLOC_MEM that could be converted into FLEX_ALLOC_STR. Convert it and write a cocci rule to prevent this from happening. Note that this was more of an exercise to teach myself how to use coccinelle. I'm just submitting a useful patch that came as a result of this. Please let me know if this is unwelcome. Denton Liu (2): midx.c: convert FLEX_ALLOC_MEM to FLEX_ALLOC_STR cocci: FLEX_ALLOC_MEM to FLEX_ALLOC_STR contrib/coccinelle/flex_alloc.cocci | 13 +++++++++++++ midx.c | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 contrib/coccinelle/flex_alloc.cocci -- 2.21.0.834.geaa57a21fa ``` ## Denton Liu, 2019-04-03 22:00 Subject: [PATCH 1/2] midx.c: convert FLEX_ALLOC_MEM to FLEX_ALLOC_STR Message-ID: <48c968a2923f76ab759327d21b37de86f7a61236.1554328261.git.liu.denton@gmail.com> URL: https://gitlist.dev/e/48c968a2923f76ab759327d21b37de86f7a61236.1554328261.git.liu.denton%40gmail.com In-Reply-To: ``` Signed-off-by: Denton Liu --- midx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midx.c b/midx.c index 8a505fd423..cb8190329a 100644 --- a/midx.c +++ b/midx.c @@ -70,7 +70,7 @@ struct multi_pack_index *load_multi_pack_index(const char *object_dir, int local midx_map = xmmap(NULL, midx_size, PROT_READ, MAP_PRIVATE, fd, 0); - FLEX_ALLOC_MEM(m, object_dir, object_dir, strlen(object_dir)); + FLEX_ALLOC_STR(m, object_dir, object_dir); m->fd = fd; m->data = midx_map; m->data_len = midx_size; -- 2.21.0.834.geaa57a21fa ``` ## Denton Liu, 2019-04-03 22:00 Subject: [PATCH 2/2] cocci: FLEX_ALLOC_MEM to FLEX_ALLOC_STR Message-ID: <78b6d3f58dc409477e801aa3d83e83ccee3841cb.1554328261.git.liu.denton@gmail.com> URL: https://gitlist.dev/e/78b6d3f58dc409477e801aa3d83e83ccee3841cb.1554328261.git.liu.denton%40gmail.com In-Reply-To: ``` Ensure that a FLEX_MALLOC_MEM that uses 'strlen' for its 'len' uses FLEX_ALLOC_STR instead, since these are equivalent forms. Signed-off-by: Denton Liu --- contrib/coccinelle/flex_alloc.cocci | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 contrib/coccinelle/flex_alloc.cocci diff --git a/contrib/coccinelle/flex_alloc.cocci b/contrib/coccinelle/flex_alloc.cocci new file mode 100644 index 0000000000..e9f7f6d861 --- /dev/null +++ b/contrib/coccinelle/flex_alloc.cocci @@ -0,0 +1,13 @@ +@@ +expression str; +identifier x, flexname; +@@ +- FLEX_ALLOC_MEM(x, flexname, str, strlen(str)); ++ FLEX_ALLOC_STR(x, flexname, str); + +@@ +expression str; +identifier x, ptrname; +@@ +- FLEXPTR_ALLOC_MEM(x, ptrname, str, strlen(str)); ++ FLEXPTR_ALLOC_STR(x, ptrname, str); -- 2.21.0.834.geaa57a21fa ``` ## Jeff King, 2019-04-04 01:57 Subject: Re: [PATCH 0/2] create FLEX_ALLOC_MEM to FLEX_ALLOC_STR cocci rule Message-ID: <20190404015659.GE4409@sigill.intra.peff.net> URL: https://gitlist.dev/e/20190404015659.GE4409%40sigill.intra.peff.net In-Reply-To: ``` On Wed, Apr 03, 2019 at 03:00:03PM -0700, Denton Liu wrote: > I was playing around with coccinelle and I noticed that we have a use of > FLEX_ALLOC_MEM that could be converted into FLEX_ALLOC_STR. Convert it > and write a cocci rule to prevent this from happening. > > Note that this was more of an exercise to teach myself how to use > coccinelle. I'm just submitting a useful patch that came as a result of > this. Please let me know if this is unwelcome. Both look pretty reasonable to me. Obviously it's a pretty trivial change, but that's sort of the point: automate these things away so we don't have to think about them during review. Now if you could figure out a way to point people to FLEX_ALLOC in the first place when they are not currently using it, _that_ would be pretty amazing. But I suspect it's a bit too complicated. :) -Peff ```