git: update to v2.46.0

[ps-cgit] / html.c

diff --git a/html.c b/html.c
index e7e6e075949bac31292cf84acd687dc40b320d64..0bac34bcf82b3a31ad3dda25f7c7bcee3d9d8f3a 100644 (file)
--- a/html.c
+++ b/html.c
@@ -59,7 +59,7 @@ char *fmt(const char *format, ...)
        va_start(args, format);
        len = vsnprintf(buf[bufidx], sizeof(buf[bufidx]), format, args);
        va_end(args);
        va_start(args, format);
        len = vsnprintf(buf[bufidx], sizeof(buf[bufidx]), format, args);
        va_end(args);

-       if (len > sizeof(buf[bufidx])) {
+       if (len >= sizeof(buf[bufidx])) {

                fprintf(stderr, "[html.c] string truncated: %s\n", format);
                exit(1);
        }
                fprintf(stderr, "[html.c] string truncated: %s\n", format);
                exit(1);
        }


@@ -124,29 +124,20 @@ void html_vtxtf(const char *format, va_list ap)
 
 void html_txt(const char *txt)
 {
 
 void html_txt(const char *txt)
 {

-       const char *t = txt;
-       while (t && *t) {
-               int c = *t;
-               if (c == '<' || c == '>' || c == '&') {
-                       html_raw(txt, t - txt);
-                       if (c == '>')
-                               html("&gt;");
-                       else if (c == '<')
-                               html("&lt;");
-                       else if (c == '&')
-                               html("&amp;");
-                       txt = t + 1;
-               }
-               t++;
-       }
-       if (t != txt)
-               html(txt);
+       if (txt)
+               html_ntxt(txt, strlen(txt));

 }
 
 }
 

-void html_ntxt(int len, const char *txt)
+ssize_t html_ntxt(const char *txt, size_t len)

 {
        const char *t = txt;
 {
        const char *t = txt;

-       while (t && *t && len--) {
+       ssize_t slen;
+
+       if (len > SSIZE_MAX)
+               return -1;
+
+       slen = (ssize_t) len;
+       while (t && *t && slen--) {

                int c = *t;
                if (c == '<' || c == '>' || c == '&') {
                        html_raw(txt, t - txt);
                int c = *t;
                if (c == '<' || c == '>' || c == '&') {
                        html_raw(txt, t - txt);


@@ -162,8 +153,7 @@ void html_ntxt(int len, const char *txt)
        }
        if (t != txt)
                html_raw(txt, t - txt);
        }
        if (t != txt)
                html_raw(txt, t - txt);

-       if (len < 0)
-               html("...");
+       return slen;

 }
 
 void html_attrf(const char *fmt, ...)
 }
 
 void html_attrf(const char *fmt, ...)