From: schwarze@mandoc.bsd.lv To: source@mandoc.bsd.lv Subject: mandoc: Clean up memory handling in spawn_pager(), free(3)ing everything Date: Mon, 4 Oct 2021 16:29:48 -0500 (EST) [thread overview] Message-ID: <c2aaf7ed8fa167c5@mandoc.bsd.lv> (raw) Log Message: ----------- Clean up memory handling in spawn_pager(), free(3)ing everything that is malloc(3)ed. In addition to being less confusing, the new code is also shorter by two lines. Modified Files: -------------- mandoc: main.c Revision Data ------------- Index: main.c =================================================================== RCS file: /home/cvs/mandoc/mandoc/main.c,v retrieving revision 1.359 retrieving revision 1.360 diff -Lmain.c -Lmain.c -u -p -r1.359 -r1.360 --- main.c +++ main.c @@ -1286,6 +1286,7 @@ spawn_pager(struct outstate *outst, char char *argv[MAX_PAGER_ARGS]; const char *pager; char *cp; + size_t wordlen; #if HAVE_LESS_T size_t cmdlen; #endif @@ -1300,7 +1301,6 @@ spawn_pager(struct outstate *outst, char pager = getenv("PAGER"); if (pager == NULL || *pager == '\0') pager = BINM_PAGER; - cp = mandoc_strdup(pager); /* * Parse the pager command into words. @@ -1308,16 +1308,12 @@ spawn_pager(struct outstate *outst, char */ argc = 0; - while (argc + 5 < MAX_PAGER_ARGS) { - argv[argc++] = cp; - cp = strchr(cp, ' '); - if (cp == NULL) - break; - *cp++ = '\0'; - while (*cp == ' ') - cp++; - if (*cp == '\0') - break; + while (*pager != '\0' && argc + 5 < MAX_PAGER_ARGS) { + wordlen = strcspn(pager, " "); + argv[argc++] = mandoc_strndup(pager, wordlen); + pager += wordlen; + while (*pager == ' ') + pager++; } /* For less(1), use the tag file. */ @@ -1329,10 +1325,10 @@ spawn_pager(struct outstate *outst, char cp = argv[0] + cmdlen - 4; if (strcmp(cp, "less") == 0) { argv[argc++] = mandoc_strdup("-T"); - argv[argc++] = outst->tag_files->tfn; + argv[argc++] = mandoc_strdup(outst->tag_files->tfn); if (tag_target != NULL) { argv[argc++] = mandoc_strdup("-t"); - argv[argc++] = tag_target; + argv[argc++] = mandoc_strdup(tag_target); use_ofn = 0; } } @@ -1343,7 +1339,7 @@ spawn_pager(struct outstate *outst, char mandoc_asprintf(&argv[argc], "file://%s#%s", outst->tag_files->ofn, tag_target); else - argv[argc] = outst->tag_files->ofn; + argv[argc] = mandoc_strdup(outst->tag_files->ofn); argc++; } argv[argc] = NULL; @@ -1355,6 +1351,8 @@ spawn_pager(struct outstate *outst, char case 0: break; default: + while (argc > 0) + free(argv[--argc]); (void)setpgid(pager_pid, 0); (void)tcsetpgrp(STDOUT_FILENO, pager_pid); #if HAVE_PLEDGE -- To unsubscribe send an email to source+unsubscribe@mandoc.bsd.lv
reply other threads:[~2021-10-04 21:29 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=c2aaf7ed8fa167c5@mandoc.bsd.lv \ --to=schwarze@mandoc.bsd.lv \ --cc=source@mandoc.bsd.lv \ --subject='Re: mandoc: Clean up memory handling in spawn_pager(), free(3)ing everything' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).