* check the buffersize while base64 encoding; and adjust it if needed.

[citadel.git] / webcit / messages.c

diff --git a/webcit/messages.c b/webcit/messages.c
index fdf9f1240d4ae44fb709e2e6d5c2803d7daba07d..abe91b05e77848873b194289ddebbca617a6d6da 100644 (file)
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -493,6 +493,7 @@ void display_parsed_vcard(struct vCard *v, int full) {
        
                        else if (!strcasecmp(firsttoken, "email")) {
                                if (!IsEmptyStr(mailto)) strcat(mailto, "<br />");
+                               long len;
                                strcat(mailto,
                                        "<a href=\"display_enter"
                                        "?force_room=_MAIL_?recp=");
@@ -503,7 +504,8 @@ void display_parsed_vcard(struct vCard *v, int full) {
                                urlesc(&mailto[strlen(mailto)], ">");
 
                                strcat(mailto, "\">");
-                               stresc(&mailto[strlen(mailto)], thisvalue, 1, 1);
+                               len = strlen(mailto);
+                               stresc(mailto+len, SIZ - len, thisvalue, 1, 1);
                                strcat(mailto, "</A>");
                        }
                        else if (!strcasecmp(firsttoken, "tel")) {
@@ -663,6 +665,7 @@ void read_message(long msgnum, int printable_view, char *section) {
        char mime_partnum[256];
        char mime_name[256];
        char mime_filename[256];
+       char escaped_mime_filename[256];
        char mime_content_type[256];
        char mime_charset[256];
        char mime_disposition[256];
@@ -855,6 +858,7 @@ void read_message(long msgnum, int printable_view, char *section) {
                                attach_links = realloc(attach_links,
                                        (num_attach_links*sizeof(struct attach_link)));
                                safestrncpy(attach_links[num_attach_links-1].partnum, mime_partnum, 32);
+                               urlesc(escaped_mime_filename, mime_filename);
                                snprintf(attach_links[num_attach_links-1].html, 1024,
                                        "<img src=\"static/diskette_24x.gif\" "
                                        "border=0 align=middle>\n"
@@ -866,10 +870,10 @@ void read_message(long msgnum, int printable_view, char *section) {
                                        " ]<br />\n",
                                        mime_filename,
                                        mime_content_type, mime_length,
-                                       msgnum, mime_partnum, mime_filename,
+                                       msgnum, mime_partnum, escaped_mime_filename,
                                        msgnum, mime_partnum,
                                        _("View"),
-                                       msgnum, mime_partnum, mime_filename,
+                                       msgnum, mime_partnum, escaped_mime_filename,
                                        _("Download")
                                );
                        }
@@ -1836,8 +1840,8 @@ int abcmp(const void *ab1, const void *ab2) {
  * \param tabbuf the tabbuffer to add name to
  * \param name the name to add to the tabbuffer
  */
-void nametab(char *tabbuf, char *name) {
-       stresc(tabbuf, name, 0, 0);
+void nametab(char *tabbuf, long len, char *name) {
+       stresc(tabbuf, len, name, 0, 0);
        tabbuf[0] = toupper(tabbuf[0]);
        tabbuf[1] = tolower(tabbuf[1]);
        tabbuf[2] = tolower(tabbuf[2]);
@@ -1889,8 +1893,8 @@ void do_addrbook_view(struct addrbookent *addrbook, int num_ab) {
                tabfirst = i * NAMESPERPAGE;
                tablast = tabfirst + NAMESPERPAGE - 1;
                if (tablast > (num_ab - 1)) tablast = (num_ab - 1);
-               nametab(tabfirst_label, addrbook[tabfirst].ab_name);
-               nametab(tablast_label, addrbook[tablast].ab_name);
+               nametab(tabfirst_label, 64, addrbook[tabfirst].ab_name);
+               nametab(tablast_label, 64, addrbook[tablast].ab_name);
                sprintf(this_tablabel, "%s&nbsp;-&nbsp;%s", tabfirst_label, tablast_label);
                tablabels[i] = strdup(this_tablabel);
        }
@@ -2751,6 +2755,7 @@ void post_mime_to_server(void) {
        struct wc_attachment *att;
        char *encoded;
        size_t encoded_length;
+       size_t encoded_strlen;
 
        /** RFC2045 requires this, and some clients look for it... */
        serv_puts("MIME-Version: 1.0");
@@ -2790,7 +2795,7 @@ void post_mime_to_server(void) {
                        encoded_length = ((att->length * 150) / 100);
                        encoded = malloc(encoded_length);
                        if (encoded == NULL) break;
-                       CtdlEncodeBase64(encoded, att->data, att->length, 1);
+                       encoded_strlen = CtdlEncodeBase64(&encoded, att->data, att->length, &encoded_length, 1);
 
                        serv_printf("--%s", boundary);
                        serv_printf("Content-type: %s", att->content_type);
@@ -2798,7 +2803,7 @@ void post_mime_to_server(void) {
                                "filename=\"%s\"", att->filename);
                        serv_puts("Content-transfer-encoding: base64");
                        serv_puts("");
-                       serv_write(encoded, strlen(encoded));
+                       serv_write(encoded, encoded_strlen);
                        serv_puts("");
                        serv_puts("");
                        free(encoded);