sync with 0.9.4cvs1

diff --git a/ChangeLog b/ChangeLog
index f3e6ce04a08f33bcde1c4d889e422c7b16872a12..f5c816fed6f5f4e93417f0a8c80fef27c2e658a8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-07-28
+
+       * src/imap.c: imap_get_flag_str(): fixed a buffer overrun.
+
+2003-07-25
+
+       * version 0.9.4
+
 2003-07-25
 
        * src/main.c: main(): don't save config files on startup.

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 0d0b8150686b5f51d193c0eb7acb4109502f16b0..584328f92418c3943b291931f8de84fd265a29ee 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2003-07-28 [paul]      0.9.3claws63
+
+       * sync with 0.9.4cvs1
+               see ChangeLog 2003-07-28
+
 2003-07-27 [alfons]    0.9.3claws62
 
        * src/mimeview.c

diff --git a/ChangeLog.jp b/ChangeLog.jp
index da3f0a0d0f08404df447ae44d10f2aaaf5d3d637..10f6028981ac6b530a19576a41d746e5e3085aed 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,11 @@
+2003-07-28
+
+       * src/imap.c: imap_get_flag_str(): ¥Ð¥Ã¥Õ¥¡¥ª¡¼¥Ð¡¼¥é¥ó¤ò½¤Àµ¡£
+
+2003-07-25
+
+       * version 0.9.4
+
 2003-07-25
 
        * src/main.c: main(): µ¯Æ°»þ¤ËÀßÄê¥Õ¥¡¥¤¥ë¤òÊݸ¤·¤Ê¤¤¤è¤¦¤Ë¤·¤¿¡£

diff --git a/src/imap.c b/src/imap.c
index 950290e9a2427edf3f5bd823c2bbfbcc987de092..82a523f61acf638226f8b4ca1423cdfdea69ea04 100644 (file)
--- a/src/imap.c
+++ b/src/imap.c
@@ -2198,7 +2198,7 @@ static gchar *imap_get_flag_str(IMAPFlags flags)
        if (IMAP_IS_DELETED(flags))     g_string_append(str, "\\Deleted ");
        if (IMAP_IS_DRAFT(flags))       g_string_append(str, "\\Draft");
 
-       if (str->str[str->len - 1] == ' ')
+       if (str->len > 0 && str->str[str->len - 1] == ' ')
                g_string_truncate(str, str->len - 1);
 
        ret = str->str;