*** ./src/backend/utils/adt/varlena.c.orig	2011-12-21 10:46:33.000000000 +0100
--- ./src/backend/utils/adt/varlena.c	2011-12-21 11:08:42.583720151 +0100
***************
*** 3668,3674 ****
  	state = PG_ARGISNULL(0) ? NULL : (StringInfo) PG_GETARG_POINTER(0);
  
  	if (state != NULL)
! 		PG_RETURN_TEXT_P(cstring_to_text(state->data));
  	else
  		PG_RETURN_NULL();
  }
--- 3668,3674 ----
  	state = PG_ARGISNULL(0) ? NULL : (StringInfo) PG_GETARG_POINTER(0);
  
  	if (state != NULL)
! 		PG_RETURN_TEXT_P(cstring_to_text_with_len(state->data, state->len));
  	else
  		PG_RETURN_NULL();
  }