Merge branch 'expiry' into 'master'

Fix parsing of the absolute date header It went unnoticed because usually the expiry time is relative. See merge request !13
sailfishos · Oct 17, 2016 · db01df3 · db01df3
2 parents 2d9cc75 + da0064d
commit db01df3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/mms-lib/src/mms_codec.c b/mms-lib/src/mms_codec.c
@@ -642,13 +642,19 @@ static gboolean extract_absolute_relative_date(struct wsp_header_iter *iter,
 	unsigned int i;
 	unsigned int seconds;
 
+	/*
+	 * Absolute-token Date-value | Relative-token Delta-seconds-value
+	 * Absolute-token = <Octet 128>
+	 * Relative-token = <Octet 129>
+	 */
 	if (wsp_header_iter_get_val_type(iter) != WSP_VALUE_TYPE_LONG)
 		return FALSE;
 
 	p = wsp_header_iter_get_val(iter);
 	l = wsp_header_iter_get_val_len(iter);
 
-	if (l < 2 || l > 5)
+	/* Token (1 byte) + value length (1 byte) + up to 4 bytes */
+	if (l < 2 || l > 6)
 		return FALSE;
 
 	if (p[0] != 128 && p[0] != 129)

diff --git a/mms-lib/test/test_mms_codec/data/m-notification_4.ind b/mms-lib/test/test_mms_codec/data/m-notification_4.ind
diff --git a/mms-lib/test/test_mms_codec/test_mms_codec.c b/mms-lib/test/test_mms_codec/test_mms_codec.c
@@ -59,6 +59,7 @@ int main(int argc, char* argv[])
         "m-notification_1.ind",
         "m-notification_2.ind",
         "m-notification_3.ind",
+        "m-notification_4.ind",
         "m-delivery.ind",
         "m-read-orig.ind",
         "m-retrieve_1.conf",