Browse code
resolve conflicts
Robert Rorschach authored on 22/01/2010 18:36:38
Showing 2 changed files
Showing 2 changed files
... | ... |
@@ -2,6 +2,11 @@ |
2 | 2 |
|
3 | 3 |
* imap.cl: threadsafe resource management |
4 | 4 |
|
5 |
+2009-12-21 Kevin Layer <layer@gemini.franz.com> |
|
6 |
+ |
|
7 |
+ * mime-api.cl (decode-header-text): bug18646: put in error |
|
8 |
+ check for `nil'. |
|
9 |
+ |
|
5 | 10 |
2009-09-30 Kevin Layer <layer@gemini.franz.com> |
6 | 11 |
|
7 | 12 |
* mime-api.cl: rfe9010: decode-header-text: remove "soft" |
... | ... |
@@ -425,6 +425,7 @@ This is a multi-part message in MIME format.~%")) |
425 | 425 |
(defun decode-header-text (text) |
426 | 426 |
(declare (optimize (speed 3)) |
427 | 427 |
(string text)) |
428 |
+ (when (null text) (error "first argument expected to be non-nil.")) |
|
428 | 429 |
(let ((pos 0) |
429 | 430 |
(len (length text)) |
430 | 431 |
last-tail) |