sync with latest 0.9.0pre1
authorPaul Mangan <paul@claws-mail.org>
Thu, 15 May 2003 08:41:43 +0000 (08:41 +0000)
committerPaul Mangan <paul@claws-mail.org>
Thu, 15 May 2003 08:41:43 +0000 (08:41 +0000)
ChangeLog
ChangeLog.claws
ChangeLog.jp
INSTALL
configure.ac
src/addr_compl.c
src/addressbook.c
src/compose.c
src/imap.c
src/main.c

index 3acac661c7ec0f01dd6a08f7a6f957327a49c590..4d16c694dd8d144362cb3a0e32981b464bbdb3b2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2003-05-15
+
+       * src/imap.c:
+         imap_parse_atom()
+         imap_get_header()
+         imap_cmd_fetch(): check for data size that servers return (fixes
+         vulnerability found in BugTraq).
+
+2003-05-14
+
+       * src/addr_compl.c: get_complete_address()
+         src/addressbook.c: addressbook_format_address()
+         src/compose.c: QUOTE_IF_REQUIRED(): quote if name contains
+         characters that is not defined in atext (RFC 2822, 3.2.4. Atom).
+       * src/main.c: main(): set colormap and visual to solve color problem
+         in Solaris (thanks to Markus Schwarzenberg).
+
 2003-05-12
 
        * version 0.9.0pre1
index 35376ee6106e23c151969f62744e1e846f4440f4..5a6a945093c8492b18903130c33dc8e82f250aa0 100644 (file)
@@ -1,3 +1,8 @@
+2003-05-15 [paul]      0.8.11claws154
+
+       * sync with latest 0.9.0pre1
+               see ChangeLog 2003-05-14 and 2003-05-14
+
 2003-05-14 [christoph] 0.8.11claws153
 
        * src/plugins/image_viewer/viewer.c
index 34458eda436fb02dc34d176685c0a4529136227e..0e9216bc7b4d7762faeef1f19719d61b8645cec9 100644 (file)
@@ -1,3 +1,21 @@
+2003-05-15
+
+       * src/imap.c:
+         imap_parse_atom()
+         imap_get_header()
+         imap_cmd_fetch(): ¥µ¡¼¥Ð¤¬ÊÖ¤¹¥Ç¡¼¥¿¥µ¥¤¥º¤ò¥Á¥§¥Ã¥¯(BugTraq ¤Ç
+         È¯¸«¤µ¤ì¤¿ÀȼåÀ­¤ò½¤Àµ)¡£
+
+2003-05-14
+
+       * src/addr_compl.c: get_complete_address()
+         src/addressbook.c: addressbook_format_address()
+         src/compose.c: QUOTE_IF_REQUIRED(): Ì¾Á°¤¬ atext (RFC 2822, 3.2.4.
+         Atom) ¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤Ê¤¤Ê¸»ú¤ò´Þ¤ó¤Ç¤¤¤ë¾ì¹ç¤Ï°úÍÑÉä¤Ç³ç¤ë¤è¤¦¤Ë
+         ¤·¤¿¡£
+       * src/main.c: main(): Solaris ¤Ë¤ª¤±¤ë¥«¥é¡¼¤ÎÌäÂê¤ò²ò·è¤¹¤ë¤¿¤á¤Ë
+         colormap ¤È visual ¤ò¥»¥Ã¥È(Markus Schwarzenberg ¤µ¤ó thanks)¡£
+
 2003-05-12
 
        * version 0.9.0pre1
diff --git a/INSTALL b/INSTALL
index f0a05de0bf0512c3d94617fff6d17e85076ff3a2..6f400c5004b8c55cc1653502190e65e92b0b11e7 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -126,7 +126,7 @@ Options for configure script
 ============================
 
   --disable-compface  disable compface (X-Face) support
-  --enable-ssl        SSL support (requires OpenSSL)
+  --enable-openssl    SSL support (requires OpenSSL)
   --enable-ipv6       IPv6 support
   --enable-gpgme      GnuPG support (requires GPGME and GnuPG)
   --enable-ldap       LDAP support
index fa536530957e8dcba71a1e39b30ca36dc0fdf94b..86e26149a464469781ce66ae3a639fbbc3a66f73 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=11
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws153
+EXTRA_VERSION=claws154
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
index e2858f068be3263dc85f5dbdb19a101726dceb71..f11f4b929c4192ac7dec82c3db7f7f514e20231b 100644 (file)
@@ -376,7 +376,8 @@ gchar *get_complete_address(gint index)
                        if (p != NULL) {
                                if (!p->name || p->name[0] == '\0')
                                        address = g_strdup_printf(p->address);
-                               else if (strchr_with_skip_quote(p->name, '"', ','))
+                               else if (p->name[0] != '"' &&
+                                        strpbrk(p->name, ",.[]<>") != NULL)
                                        address = g_strdup_printf
                                                ("\"%s\" <%s>", p->name, p->address);
                                else
index f528d578f141c2619367a0f9b1989bd3c70fe394..8d5bdc2c35ea3ba68789276436eee9f1d7490567 100644 (file)
@@ -1116,7 +1116,7 @@ gchar *addressbook_format_address( AddrItemObject * aio ) {
        }
        if( address ) {
                if( name && name[0] != '\0' ) {
-                       if( strchr_with_skip_quote( name, '"', ',' ) )
+                       if( name[0] != '"' && strpbrk( name, ",.[]<>" ) != NULL )
                                buf = g_strdup_printf( "\"%s\" <%s>", name, address );
                        else
                                buf = g_strdup_printf( "%s <%s>", name, address );
index 50bc4afbed3d2f91bbc750dd1f74861f9c7efa78..d2f40f4ada7104a349f6c1d45333154773094988 100644 (file)
@@ -3946,8 +3946,7 @@ static void compose_write_attach(Compose *compose, FILE *fp)
 
 #define QUOTE_IF_REQUIRED(out, str)                    \
 {                                                      \
-       if (*str != '"' && (strchr(str, ',')            \
-                       || strchr(str, '.'))) {         \
+       if (*str != '"' && strpbrk(str, ",.[]<>")) {    \
                gchar *__tmp;                           \
                gint len;                               \
                                                        \
index c79f52dad66568c1cae1bd58a9186a9fad4eb291..8d7b6c4c6d3fdfb336ff07998dd1c889585a457f 100644 (file)
@@ -1859,6 +1859,7 @@ static gchar *imap_parse_atom(SockInfo *sock, gchar *src,
 
                cur_pos = strchr_cpy(cur_pos + 1, '}', buf, sizeof(buf));
                len = atoi(buf);
+               g_return_val_if_fail(len > 0, cur_pos);
 
                g_string_truncate(str, 0);
                cur_pos = str->str;
@@ -1901,6 +1902,7 @@ static gchar *imap_get_header(SockInfo *sock, gchar *cur_pos, gchar **headers,
 
        cur_pos = strchr_cpy(cur_pos + 1, '}', buf, sizeof(buf));
        len = atoi(buf);
+       g_return_val_if_fail(len > 0, cur_pos);
 
        g_string_truncate(str, 0);
        cur_pos = str->str;
@@ -2550,6 +2552,7 @@ static gint imap_cmd_fetch(IMAPSession *session, guint32 uid, const gchar *filen
                return IMAP_ERROR;
        }
        size_num = atol(size_str);
+       g_return_val_if_fail(size_num > 0, IMAP_ERROR);
 
        if (*cur_pos != '\0') {
                g_free(buf);
index 0d54030eb5798a094d7e23a7b4d3bf687cbbbcfa..554a890c7c640efc8720660a2ddfb70feee47886 100644 (file)
@@ -198,6 +198,10 @@ int main(int argc, char *argv[])
        gtk_set_locale();
        gtk_init(&argc, &argv);
 
+       gdk_rgb_init();
+       gtk_widget_set_default_colormap(gdk_rgb_get_cmap());
+       gtk_widget_set_default_visual(gdk_rgb_get_visual());
+
 #if USE_THREADS || USE_LDAP
        g_thread_init(NULL);
        if (!g_thread_supported())