* if we find an '&', try to watch out for an ; within the next 6 chars. if we find...

* fixiate our endpoint by a '\0' so the other fixups don't trick us.

diff --git a/webcit/html2html.c b/webcit/html2html.c
index 893acf2a9fa56d49604fbeffc90586795d63152f..a695292fe869c349f13f3f20ccd68d76b8544c2d 100644 (file)
--- a/webcit/html2html.c
+++ b/webcit/html2html.c
@@ -359,6 +359,7 @@ void output_html(char *supplied_charset, int treat_as_wiki) {
                                /** Find the end of the link */
                                int strlenptr;
                                linklen = 0;
+                               
                                strlenptr = strlen(ptr);
                                for (i=0; i<=strlenptr; ++i) {
                                        if ((ptr[i]==0)
@@ -371,13 +372,30 @@ void output_html(char *supplied_charset, int treat_as_wiki) {
                                           ||(ptr[i]=='>')
                                           ||(ptr[i]=='[')
                                           ||(ptr[i]==']')
+                                          ||(ptr[i]=='"')
+                                          ||(ptr[i]=='\'')
                                        ) linklen = i;
+                                       /* did s.b. send us an entity? */
+                                       if (ptr[i] == '&') {
+                                               if ((ptr[i+2] ==';') ||
+                                                   (ptr[i+3] ==';') ||
+                                                   (ptr[i+5] ==';') ||
+                                                   (ptr[i+6] ==';') ||
+                                                   (ptr[i+7] ==';'))
+                                                       linklen = i;
+                                       }
                                        if (linklen > 0) break;
                                }
                                if (linklen > 0) {
                                        char *ltreviewptr;
                                        char *nbspreviewptr;
-                                       //* spot for some subject strings tinymce tends to give us.
+                                       char linkedchar;
+                                       int len = linklen;
+                                       
+                                       len = linklen;
+                                       linkedchar = ptr[len];
+                                       ptr[len] = '\0';
+                                       /* spot for some subject strings tinymce tends to give us. */
                                        ltreviewptr = strchr(ptr, '<');
                                        if (ltreviewptr != NULL) {
                                                *ltreviewptr = '\0';
@@ -392,6 +410,8 @@ void output_html(char *supplied_charset, int treat_as_wiki) {
                                        if (ltreviewptr != 0)
                                                *ltreviewptr = '<';
 
+                                       ptr[len] = linkedchar;
+
                                        content_length += (32 + linklen);
                                        if (content_length >= converted_alloc) {
                                                converted_alloc += 8192;