diff --git a/lib/gnutls_ecc.c b/lib/gnutls_ecc.c

index 51abe7b..5816b96 100644

--- a/lib/gnutls_ecc.c

+++ b/lib/gnutls_ecc.c

@@ -53,12 +53,24 @@ _gnutls_ecc_ansi_x963_export (gnutls_ecc_curve_t curve, bigint_t x, bigint_t y,

   /* pad and store x */

   byte_size = (_gnutls_mpi_get_nbits (x) + 7) / 8;

+  if (numlen < byte_size)

+    {

+      ret = gnutls_assert_val(GNUTLS_E_INVALID_REQUEST);

+      goto cleanup;

+    }

+

   size = out->size - (1 + (numlen - byte_size));

   ret = _gnutls_mpi_print (x, &out->data[1 + (numlen - byte_size)], &size);

   if (ret < 0)

     return gnutls_assert_val (ret);

   byte_size = (_gnutls_mpi_get_nbits (y) + 7) / 8;

+  if (numlen < byte_size)

+    {

+      ret = gnutls_assert_val(GNUTLS_E_INVALID_REQUEST);

+      goto cleanup;

+    }

+

   size = out->size - (1 + (numlen + numlen - byte_size));

   ret =

     _gnutls_mpi_print (y, &out->data[1 + numlen + numlen - byte_size], &size);

@@ -67,6 +79,9 @@ _gnutls_ecc_ansi_x963_export (gnutls_ecc_curve_t curve, bigint_t x, bigint_t y,

   /* pad and store y */

   return 0;

+cleanup:

+  _gnutls_free_datum(out);

+  return ret;

 }