icalvalue: return "" for NO_VALUE if ALLOW_EMPTY_PROPERTIES=true

cyrusimap · Jul 1, 2024 · 6645e05 · 6645e05
1 parent 6d09bc8
commit 6645e05
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/src/libical/icalproperty.c b/src/libical/icalproperty.c
@@ -345,6 +345,11 @@ const char *icalproperty_as_ical_string(icalproperty *prop)
     char *buf;
 
     buf = icalproperty_as_ical_string_r(prop);
+#if ICAL_ALLOW_EMPTY_PROPERTIES
+    /* empty string is set to no-value, per commit b1a9eb33597028b2d160f289b6105f4aa67276a7
+     * which return NULL as the string value.  Convert back to an empty string here */
+    if (!buf) return "";
+#endif
     icalmemory_add_tmp_buffer(buf);
     return buf;
 }

diff --git a/src/libical/icalvalue.c b/src/libical/icalvalue.c
@@ -1206,9 +1206,17 @@ char *icalvalue_as_ical_string_r(const icalvalue *value)
         /* FALLTHRU */
 
     case ICAL_NO_VALUE:
-    default: {
-        return 0;
-    }
+    default:
+        {
+#if ICAL_ALLOW_EMPTY_PROPERTIES
+            /* empty string is set to no-value, per
+             * commit b1a9eb33597028b2d160f289b6105f4aa67276a7
+             * Convert back to an empty string here */
+            return icalmemory_strdup("");
+#else
+            return 0;
+#endif
+        }
     }
 }