From a39dc4a6108668567ac8e9b9dd029d7ac019eccf Mon Sep 17 00:00:00 2001 From: arm64v8a <48624112+arm64v8a@users.noreply.github.com> Date: Fri, 25 Aug 2023 13:59:30 +0900 Subject: [PATCH] Fix xray panic --- go/cmd/nekoray_core/instance.go | 3 +-- libs/get_source_env.sh | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/go/cmd/nekoray_core/instance.go b/go/cmd/nekoray_core/instance.go index 8f4d498..402b974 100644 --- a/go/cmd/nekoray_core/instance.go +++ b/go/cmd/nekoray_core/instance.go @@ -3,7 +3,6 @@ package main import ( "log" "strings" - "unsafe" core "github.com/xtls/xray-core/core" "github.com/xtls/xray-core/features/stats" @@ -41,7 +40,7 @@ func NewNekoV2rayInstance(configStr string) (*NekoV2RayInstance, error) { } func (i *NekoV2RayInstance) CorePtr() uintptr { - return uintptr(unsafe.Pointer(i.Instance)) + return 0 } func (i *NekoV2RayInstance) Close() error { diff --git a/libs/get_source_env.sh b/libs/get_source_env.sh index 3777672..67a59ba 100644 --- a/libs/get_source_env.sh +++ b/libs/get_source_env.sh @@ -1,6 +1,6 @@ if [ ! -z $ENV_NEKORAY ]; then export COMMIT_SING_BOX_EXTRA="3c5d4ae9b771f216bc0eeabdf19d840c77e29858" - export COMMIT_MATSURI_XRAY="02b41a79b8053031ffa6a546ae0de08c553bf391" + export COMMIT_MATSURI_XRAY="92a8a7f4650fd2e904cd273dee7f5e77271b29de" fi if [ ! -z $ENV_SING_BOX_EXTRA ]; then