author | Lars Hjemli <hjemli@gmail.com> | 2011-05-22 10:45:32 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2011-05-23 20:58:35 (UTC) |
commit | dc1a8eadd4c063fe6782fa99f9db41c46b85d048 (patch) (side-by-side diff) | |
tree | b946f7378d4a4e846c2b247ee7ed12b3f0784e7e /shared.c | |
parent | 084ca50972b4be120eba8d22ce585766ae315c36 (diff) | |
download | cgit-dc1a8eadd4c063fe6782fa99f9db41c46b85d048.zip cgit-dc1a8eadd4c063fe6782fa99f9db41c46b85d048.tar.gz cgit-dc1a8eadd4c063fe6782fa99f9db41c46b85d048.tar.bz2 |
shared.c: do not modify const memory
Noticed-by: zhongjj <zhongjj@lemote.com>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | shared.c | 14 |
1 files changed, 3 insertions, 11 deletions
@@ -79,65 +79,57 @@ struct cgit_repo *cgit_get_repoinfo(const char *url) for (i=0; i<cgit_repolist.count; i++) { repo = &cgit_repolist.repos[i]; if (!strcmp(repo->url, url)) return repo; } return NULL; } void *cgit_free_commitinfo(struct commitinfo *info) { free(info->author); free(info->author_email); free(info->committer); free(info->committer_email); free(info->subject); free(info->msg); free(info->msg_encoding); free(info); return NULL; } char *trim_end(const char *str, char c) { int len; - char *s, *t; if (str == NULL) return NULL; - t = (char *)str; - len = strlen(t); - while(len > 0 && t[len - 1] == c) + len = strlen(str); + while(len > 0 && str[len - 1] == c) len--; - if (len == 0) return NULL; - - c = t[len]; - t[len] = '\0'; - s = xstrdup(t); - t[len] = c; - return s; + return xstrndup(str, len); } char *strlpart(char *txt, int maxlen) { char *result; if (!txt) return txt; if (strlen(txt) <= maxlen) return txt; result = xmalloc(maxlen + 1); memcpy(result, txt, maxlen - 3); result[maxlen-1] = result[maxlen-2] = result[maxlen-3] = '.'; result[maxlen] = '\0'; return result; } char *strrpart(char *txt, int maxlen) { char *result; if (!txt) return txt; |