Pablu/go-sqlite3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix panic when registered functions return named types

Browse Source
This commit is contained in:
Yasuhiro Matsumoto
2026-07-13 10:25:47 +09:00
parent 78710fc089
commit 2485463b62
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
callback.go
View File

@@ -326,8 +326,7 @@ func callbackRetInteger(ctx *C.sqlite3_context, v reflect.Value) error {
case reflect.Int8, reflect.Int16, reflect.Int32, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Int, reflect.Uint: case reflect.Int8, reflect.Int16, reflect.Int32, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Int, reflect.Uint:
v = v.Convert(reflect.TypeOf(int64(0))) v = v.Convert(reflect.TypeOf(int64(0)))
case reflect.Bool: case reflect.Bool:
b := v.Interface().(bool) if v.Bool() {
if b {
v = reflect.ValueOf(int64(1)) v = reflect.ValueOf(int64(1))
} else { } else {
v = reflect.ValueOf(int64(0)) v = reflect.ValueOf(int64(0))
@@ -336,7 +335,7 @@ func callbackRetInteger(ctx *C.sqlite3_context, v reflect.Value) error {
return fmt.Errorf("cannot convert %s to INTEGER", v.Type()) return fmt.Errorf("cannot convert %s to INTEGER", v.Type())
} }
C.sqlite3_result_int64(ctx, C.sqlite3_int64(v.Interface().(int64))) C.sqlite3_result_int64(ctx, C.sqlite3_int64(v.Int()))
return nil return nil
} }
@@ -349,7 +348,7 @@ func callbackRetFloat(ctx *C.sqlite3_context, v reflect.Value) error {
return fmt.Errorf("cannot convert %s to FLOAT", v.Type()) return fmt.Errorf("cannot convert %s to FLOAT", v.Type())
} }
C.sqlite3_result_double(ctx, C.double(v.Interface().(float64))) C.sqlite3_result_double(ctx, C.double(v.Float()))
return nil return nil
} }
@@ -357,11 +356,10 @@ func callbackRetBlob(ctx *C.sqlite3_context, v reflect.Value) error {
if v.Type().Kind() != reflect.Slice || v.Type().Elem().Kind() != reflect.Uint8 { if v.Type().Kind() != reflect.Slice || v.Type().Elem().Kind() != reflect.Uint8 {
return fmt.Errorf("cannot convert %s to BLOB", v.Type()) return fmt.Errorf("cannot convert %s to BLOB", v.Type())
} }
i := v.Interface() bs := v.Bytes()
if i == nil || len(i.([]byte)) == 0 { if len(bs) == 0 {
C.sqlite3_result_null(ctx) C.sqlite3_result_null(ctx)
} else { } else {
bs := i.([]byte)
if i64 && len(bs) > math.MaxInt32 { if i64 && len(bs) > math.MaxInt32 {
C.sqlite3_result_error_toobig(ctx) C.sqlite3_result_error_toobig(ctx)
return nil return nil
@@ -375,7 +373,7 @@ func callbackRetText(ctx *C.sqlite3_context, v reflect.Value) error {
if v.Type().Kind() != reflect.String { if v.Type().Kind() != reflect.String {
return fmt.Errorf("cannot convert %s to TEXT", v.Type()) return fmt.Errorf("cannot convert %s to TEXT", v.Type())
} }
s := v.Interface().(string) s := v.String()
if i64 && len(s) > math.MaxInt32 { if i64 && len(s) > math.MaxInt32 {
C.sqlite3_result_error_toobig(ctx) C.sqlite3_result_error_toobig(ctx)
return nil return nil