From 774f972eb70286465745cfdf0dc14c922cc08f4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ezgi=20=C3=87i=C3=A7ek?= <ezgi@fb.com>
Date: Fri, 31 Jul 2020 07:53:10 -0700
Subject: [PATCH] [inferbo] revise NSArray alloc and init model

Summary: `alloc` actually allocates the array, not the `init`. Let's reflect that in our models.

Reviewed By: roro47

Differential Revision: D22864198

fbshipit-source-id: 687f9f247
---
 infer/src/bufferoverrun/bufferOverrunModels.ml | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/infer/src/bufferoverrun/bufferOverrunModels.ml b/infer/src/bufferoverrun/bufferOverrunModels.ml
index 0238e09c0..4fcc9eaca 100644
--- a/infer/src/bufferoverrun/bufferOverrunModels.ml
+++ b/infer/src/bufferoverrun/bufferOverrunModels.ml
@@ -149,6 +149,18 @@ let malloc ~can_be_zero size_exp =
   {exec; check}
 
 
+let objc_malloc exp =
+  let can_be_zero = true in
+  let exec ({tenv} as model) ~ret mem =
+    match exp with
+    | Exp.Sizeof {typ} when PatternMatch.ObjectiveC.implements "NSArray" tenv (Typ.to_string typ) ->
+        (malloc ~can_be_zero Exp.zero).exec model ~ret mem
+    | _ ->
+        (malloc ~can_be_zero exp).exec model ~ret mem
+  in
+  {exec; check= check_alloc_size ~can_be_zero exp}
+
+
 let calloc size_exp stride_exp =
   let byte_size_exp = Exp.BinOp (Binop.Mult (Some Typ.size_t), size_exp, stride_exp) in
   malloc byte_size_exp
@@ -1547,14 +1559,15 @@ module Call = struct
       ; -"strndup" <>$ capt_exp $+ capt_exp $+...$--> strndup
       ; -"vsnprintf" <>--> by_value Dom.Val.Itv.nat
       ; (* ObjC models *)
-        -"CFArrayCreate" <>$ any_arg $+ capt_exp $+ capt_exp $+...$--> NSCollection.create_array
+        -"__objc_alloc_no_fail" <>$ capt_exp $+...$--> objc_malloc
+      ; -"CFArrayCreate" <>$ any_arg $+ capt_exp $+ capt_exp $+...$--> NSCollection.create_array
       ; -"CFArrayCreateCopy" <>$ any_arg $+ capt_exp $!--> create_copy_array
       ; -"CFArrayGetCount" <>$ capt_exp $!--> NSCollection.length
       ; -"CFArrayGetValueAtIndex" <>$ capt_var_exn $+ capt_exp $!--> NSCollection.get_at_index
       ; -"CFDictionaryGetCount" <>$ capt_exp $!--> NSCollection.length
       ; -"MCFArrayGetCount" <>$ capt_exp $!--> NSCollection.length
       ; +PatternMatch.ObjectiveC.implements "NSArray" &:: "array" <>--> NSCollection.empty_array
-      ; +PatternMatch.ObjectiveC.implements "NSArray" &:: "init" <>--> NSCollection.empty_array
+      ; +PatternMatch.ObjectiveC.implements "NSArray" &:: "init" <>$ capt_exp $--> id
       ; +PatternMatch.ObjectiveC.implements "NSArray"
         &:: "count" <>$ capt_exp $!--> NSCollection.length
       ; +PatternMatch.ObjectiveC.implements "NSArray"