File tree Expand file tree Collapse file tree 1 file changed +5
-5
lines changed Expand file tree Collapse file tree 1 file changed +5
-5
lines changed Original file line number Diff line number Diff line change @@ -448,7 +448,7 @@ if __err != nil {
448
448
retvals [i ] = "cret" + strconv .Itoa (i )
449
449
}
450
450
if fsym .haserr {
451
- retvals [nres - 1 ] = "__err "
451
+ retvals [nres - 1 ] = "__err_ret "
452
452
}
453
453
454
454
// Call upstream method and collect returns.
@@ -470,19 +470,19 @@ if __err != nil {
470
470
if rvHasErr {
471
471
retvals [npyres - 1 ] = "estr" // NOTE: leaked string
472
472
g .gofile .Printf ("var estr C.CString\n " )
473
- g .gofile .Printf ("if __err != nil {\n " )
473
+ g .gofile .Printf ("if __err_ret != nil {\n " )
474
474
g .gofile .Indent ()
475
- g .gofile .Printf ("estr = C.CString(__err .Error())// NOTE: leaked string\n " ) // NOTE: leaked string
475
+ g .gofile .Printf ("estr = C.CString(__err_ret .Error())// NOTE: leaked string\n " ) // NOTE: leaked string
476
476
g .gofile .Outdent ()
477
477
g .gofile .Printf ("} else {\n " )
478
478
g .gofile .Indent ()
479
479
g .gofile .Printf ("estr = C.CString(\" \" )// NOTE: leaked string\n " ) // NOTE: leaked string
480
480
g .gofile .Outdent ()
481
481
g .gofile .Printf ("}\n " )
482
482
} else {
483
- g .gofile .Printf ("if __err != nil {\n " )
483
+ g .gofile .Printf ("if __err_ret != nil {\n " )
484
484
g .gofile .Indent ()
485
- g .gofile .Printf ("estr := C.CString(__err .Error())\n " ) // NOTE: freed string
485
+ g .gofile .Printf ("estr := C.CString(__err_ret .Error())\n " ) // NOTE: freed string
486
486
g .gofile .Printf ("C.PyErr_SetString(C.PyExc_RuntimeError, estr)\n " )
487
487
g .gofile .Printf ("C.free(unsafe.Pointer(estr))\n " ) // python should have converted, safe
488
488
g .gofile .Outdent ()
You can’t perform that action at this time.
0 commit comments