> From: Philipp Stephani <p.stephani2@gmail.com>
> Date: Sun,  1 Oct 2017 12:56:47 +0200
> Cc: Philipp Stephani <phst@google.com>
>
> diff --git a/src/editfns.c b/src/editfns.c
> index e326604467..4dcf7cbe6e 100644
> --- a/src/editfns.c
> +++ b/src/editfns.c
> @@ -1256,10 +1256,10 @@ If POS is out of range, the value is nil.  */)
>    if (NILP (pos))
>      {
>        pos_byte = PT_BYTE;
> -      XSETFASTINT (pos, PT);
> +      if (pos_byte < BEGV_BYTE || pos_byte >= ZV_BYTE)
> +        return Qnil;
>      }
> -
> -  if (MARKERP (pos))
> +  else if (MARKERP (pos))
>      {
>        pos_byte = marker_byte_position (pos);
>        if (pos_byte < BEGV_BYTE || pos_byte >= ZV_BYTE)

LGTM, thanks.