Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bufferoverrun Analysis - small fixes and improvements #1736

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Bufferoverrun Analysis - small fixes and improvements #1736

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
31ab607
[inferbo] Fix an ignored case when the upper bounds of offset is +oo,…
sjxer723 Feb 3, 2023
fd0a4e6
[inferbo] Make a more precise upper/lower bound when adding two upper…
sjxer723 Feb 6, 2023
347d391
[inferbo] Initialize locations for arrays within struct typed variables
sjxer723 Feb 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 25 additions & 1 deletion infer/src/bufferoverrun/bufferOverrunUtils.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ module Sem = BufferOverrunSemantics
module Trace = BufferOverrunTrace
module TraceSet = Trace.Set
module TypModels = BufferOverrunTypModels
module BoField = BufferOverrunField

module ModelEnv = struct
type model_env =
Expand Down Expand Up @@ -52,14 +53,37 @@ module Exec = struct
mem


let rec decl_local_loc ({tenv} as model_env) loc typ ~inst_num ~represents_multiple_values
let rec decl_local_struct_fields_loc: ModelEnv.model_env -> Loc.t -> Struct.fields -> Dom.Mem.t * int -> Dom.Mem.t * int =
fun model_env loc fields (mem, inst_num) ->
match fields with
| field :: tl -> (
match field with
| (fn, typ, _) -> (
match typ.desc with
| Tarray {elt= _; length; stride} ->
let child_loc = BoField.Field {prefix= loc; fn; typ = (Some typ)} in
let stride = Option.map ~f:IntLit.to_int_exn stride in
let (mem, inst_num) = decl_local_array model_env child_loc typ ~length ?stride ~inst_num
~represents_multiple_values:false ~dimension:1 mem
in
decl_local_struct_fields_loc model_env loc tl (mem, inst_num)
| _ -> decl_local_struct_fields_loc model_env loc tl (mem, inst_num)))
| [] -> (mem, inst_num)
and decl_local_loc ({tenv} as model_env) loc typ ~inst_num ~represents_multiple_values
~dimension mem =
match typ.Typ.desc with
| Typ.Tarray {elt= typ; length; stride} ->
let stride = Option.map ~f:IntLit.to_int_exn stride in
decl_local_array model_env loc typ ~length ?stride ~inst_num ~represents_multiple_values
~dimension mem
| Typ.Tstruct typname -> (
let mem = (
match Tenv.lookup tenv typname with
| Some {fields} ->
let (mem, _) = decl_local_struct_fields_loc model_env loc fields (mem, 1) in mem
| None -> mem
)
in
Comment on lines +80 to +86
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it is better to pass current dimension and inst_num, to distinguish the allocation sites.

        let mem, inst_num =
          match Tenv.lookup tenv typname with
          | Some {fields} ->
              decl_local_struct_fields_loc model_env loc fields ~inst_num ~dimension mem
          | None ->
              (mem, inst_num)
        in

match TypModels.dispatch tenv typname with
| Some (CArray {element_typ; length}) ->
decl_local_array model_env loc element_typ ~length:(Some length) ~inst_num
Expand Down