GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-05-25 10:48:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

the unmarshaller should not be disposed twice in case of error

Browse Source
This commit is contained in:
krangelov
2021-08-12 14:16:19 +02:00
parent 3578355bd0
commit a8403d48fa
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/runtime/haskell/PGF2.hsc
View File

@@ -70,11 +70,9 @@ readPGF fpath =
then do fptr <- newForeignPtr pgf_free_fptr c_pgf then do fptr <- newForeignPtr pgf_free_fptr c_pgf
return (PGF fptr Map.empty) return (PGF fptr Map.empty)
else if ex_type == (#const PGF_EXN_SYSTEM_ERROR) else if ex_type == (#const PGF_EXN_SYSTEM_ERROR)
then do freeUnmarshaller u then do errno <- (#peek PgfExn, code) c_exn
errno <- (#peek PgfExn, code) c_exn
ioError (errnoToIOError "readPGF" (Errno errno) Nothing (Just fpath)) ioError (errnoToIOError "readPGF" (Errno errno) Nothing (Just fpath))
else do freeUnmarshaller u else do c_msg <- (#peek PgfExn, msg) c_exn
c_msg <- (#peek PgfExn, msg) c_exn
msg <- peekCString c_msg msg <- peekCString c_msg
free c_msg free c_msg
throwIO (PGFError msg) throwIO (PGFError msg)
@@ -96,11 +94,9 @@ bootNGF pgf_path ngf_path =
then do fptr <- newForeignPtr pgf_free_fptr c_pgf then do fptr <- newForeignPtr pgf_free_fptr c_pgf
return (PGF fptr Map.empty) return (PGF fptr Map.empty)
else if ex_type == (#const PGF_EXN_SYSTEM_ERROR) else if ex_type == (#const PGF_EXN_SYSTEM_ERROR)
then do freeUnmarshaller u then do errno <- (#peek PgfExn, code) c_exn
errno <- (#peek PgfExn, code) c_exn
ioError (errnoToIOError "bootNGF" (Errno errno) Nothing (Just pgf_path)) ioError (errnoToIOError "bootNGF" (Errno errno) Nothing (Just pgf_path))
else do freeUnmarshaller u else do c_msg <- (#peek PgfExn, msg) c_exn
c_msg <- (#peek PgfExn, msg) c_exn
msg <- peekCString c_msg msg <- peekCString c_msg
free c_msg free c_msg
throwIO (PGFError msg) throwIO (PGFError msg)
@@ -121,11 +117,9 @@ readNGF fpath =
then do fptr <- newForeignPtr pgf_free_fptr c_pgf then do fptr <- newForeignPtr pgf_free_fptr c_pgf
return (PGF fptr Map.empty) return (PGF fptr Map.empty)
else if ex_type == (#const PGF_EXN_SYSTEM_ERROR) else if ex_type == (#const PGF_EXN_SYSTEM_ERROR)
then do freeUnmarshaller u then do errno <- (#peek PgfExn, code) c_exn
errno <- (#peek PgfExn, code) c_exn
ioError (errnoToIOError "readPGF" (Errno errno) Nothing (Just fpath)) ioError (errnoToIOError "readPGF" (Errno errno) Nothing (Just fpath))
else do freeUnmarshaller u else do c_msg <- (#peek PgfExn, msg) c_exn
c_msg <- (#peek PgfExn, msg) c_exn
msg <- peekCString c_msg msg <- peekCString c_msg
free c_msg free c_msg
throwIO (PGFError msg) throwIO (PGFError msg)