--- rpl/src/rplexternals.h 2018/05/30 16:50:13 1.90 +++ rpl/src/rplexternals.h 2018/05/30 16:56:07 1.91 @@ -1105,21 +1105,21 @@ ifIsString(rpl_object) string = (char *) (*rpl_object).objet; \ else executionError("Type mismatch error"); } while(0) -#define unEscString(s) do { \ +#define unEscString(s) ({ \ unsigned char *__a; integer8 __l; \ __a = formateur_flux((*rpl_arguments).s_etat_processus, \ (unsigned char *) s, &__l); \ if (nullified(__a)) systemError("Memory allocation error"); \ - free(s); s = (string) __a; \ - } while(0) + (string) __a; \ + }) -#define escString(rpl_object) do { \ +#define escString(rpl_object) ({ \ unsigned char *__a; integer8 __l; \ __a = analyse_flux((*rpl_arguments).s_etat_processus, \ (unsigned char *) s, strlen(s)); \ if (nullified(__a)) systemError("Memory allocation error"); \ - free(s); s = (string) __a; \ - } while(0) + (string) __a; \ + }) #define createStringObject(rpl_object) do { \ struct_processus *s_etat_processus; \