logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git

0003-Avoid-unnecessary-VLA.patch (1098B)

    

  1. From 4e30a1cc8fb347d24861fd1a702c56b5644b9431 Mon Sep 17 00:00:00 2001
  2. From: Michael Forney <mforney@mforney.org>
  3. Date: Fri, 30 Apr 2021 19:43:25 -0700
  4. Subject: [PATCH] Avoid unnecessary VLA
  6. This VLA has a constant size, so just use a regular array instead.
  7. ---
  8.  inotify_handler.c | 5 ++---
  9.  1 file changed, 2 insertions(+), 3 deletions(-)
  11. diff --git a/inotify_handler.c b/inotify_handler.c
  12. index bb4ee14..ea64955 100644
  13. --- a/inotify_handler.c
  14. +++ b/inotify_handler.c
  15. @@ -67,8 +67,7 @@ static void process_inotify(int fd)
  16.  		return;
  17.  	}
  18.  
  19. -	const int dnsize = NAME_MAX + 1;
  20. -	char devname[dnsize];
  21. +	char devname[NAME_MAX + 1];
  22.  
  23.  	/* while there are still messages in eventbuf */
  24.  	while (processed_bytes < bytes) {
  25. @@ -82,7 +81,7 @@ static void process_inotify(int fd)
  26.  			/* devname = ACPID_INPUTLAYERDIR + "/" + pevent -> name */
  27.  			strcpy(devname, ACPID_INPUTLAYERDIR);
  28.  			strcat(devname, "/");
  29. -			strncat(devname, curevent->name, dnsize - strlen(devname) - 1);
  30. +			strncat(devname, curevent->name, sizeof(devname) - strlen(devname) - 1);
  31.  		}
  32.  
  33.  		/* if this is a create */
  34. -- 
  35. 2.31.1