@@ -100,7 +100,7 @@ int fixup_regexpNL_none(void** param, int param_no); /* textops */

 		int ret; \

 		if ((ret=fixup_fp_##suffix (param, param_no))!=0) \

 			return ret; \

-		*param=&((fparam_t*)*param)->v; \

+		*param=((fparam_t*)*param)->fixed; \

 		return 0; \

 	} \

 	int fixup_free_##suffix (void** param, int param_no) \

@@ -1142,6 +1142,7 @@ int fix_param(int type, void** param)

 				p->v.pvs=0;

 				goto error;

 			}

+			p->fixed = p->v.pvs;

 			break;

 		case FPARAM_PVE:

 			name.s = (char*)*param;

@@ -1154,6 +1155,8 @@ int fix_param(int type, void** param)

 	}

 	p->type = type;

+	if(p->fixed==NULL)

+		p->fixed = &p->v;

 	*param = (void*)p;

 	return 0;

@@ -252,9 +252,9 @@ enum {

  * Function parameter

  */

 typedef struct fparam {

-        char* orig;                       /* The original value */

-        int type;                         /* Type of parameter */

-        union {

+	char* orig;                       /* The original value */

+	int type;                         /* Type of parameter */

+	union {

 		char* asciiz;             /* Zero terminated ASCII string */

 		struct _str str;          /* pointer/len string */

 		int i;                    /* Integer value */

@@ -265,6 +265,7 @@ typedef struct fparam {

 		pv_spec_t* pvs;    /* kamailo pseudo-vars */

 		pv_elem_t* pve;    /* kamailo pseudo-vars in a string */

 	} v;

+	void *fixed;

 } fparam_t;