src/basic/alloc-util.h

@@ -51,11 +51,9 @@ static inline void *mfree(void *memory) {
 
 #define free_and_replace(a, b)                  \
         ({                                      \
-                typeof(a)* _a = &(a);           \
+                free(a);                        \
-                typeof(b)* _b = &(b);           \
+                (a) = (b);                      \
-                free(*_a);                      \
+                (b) = NULL;                     \
-                (*_a) = (*_b);                  \
-                (*_b) = NULL;                   \
                 0;                              \
         })
 

src/basic/strv.h

@@ -233,11 +233,9 @@ int fputstrv(FILE *f, char * const *l, const char *separator, bool *space);
 
 #define strv_free_and_replace(a, b)             \
         ({                                      \
-                char ***_a = &(a);              \
+                strv_free(a);                   \
-                char ***_b = &(b);              \
+                (a) = (b);                      \
-                strv_free(*_a);                 \
+                (b) = NULL;                     \
-                (*_a) = (*_b);                  \
-                (*_b) = NULL;                   \
                 0;                              \
         })
 

src/xdg-autostart-generator/xdg-autostart-service.c

@@ -416,7 +416,8 @@ int xdg_autostart_format_exec_start(
                         if (!escaped)
                                 return log_oom();
 
-                        free_and_replace(exec_split[n++], escaped);
+                        free_and_replace(exec_split[n], escaped);
+                        n++;
                         continue;
                 }
 
@@ -456,7 +457,8 @@ int xdg_autostart_format_exec_start(
                 if (!quoted)
                         return log_oom();
 
-                free_and_replace(exec_split[n++], quoted);
+                free_and_replace(exec_split[n], quoted);
+                n++;
         }
         for (; exec_split[n]; n++)
                 exec_split[n] = mfree(exec_split[n]);