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.

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

Add missing accesses to VLA lengths #1016

Merged
merged 4 commits into from
Mar 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions src/analyses/accessAnalysis.ml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,10 @@ struct

(** Transfer functions: *)

let vdecl ctx v =
access_one_top ctx Read false (SizeOf v.vtype);
ctx.local

let assign ctx lval rval : D.t =
(* ignore global inits *)
if !GU.global_initialization then ctx.local else begin
Expand Down
21 changes: 20 additions & 1 deletion src/domains/access.ml
Original file line number Diff line number Diff line change
Expand Up @@ -282,13 +282,32 @@ and distribute_access_exp f = function
distribute_access_exp f b;
distribute_access_exp f t;
distribute_access_exp f e

| SizeOf t ->
distribute_access_type f t

| Const _
| SizeOf _
| SizeOfStr _
| AlignOf _
| AddrOfLabel _ ->
()

and distribute_access_type f = function
| TArray (et, len, _) ->
Option.may (distribute_access_exp f) len;
distribute_access_type f et

| TVoid _
| TInt _
| TFloat _
| TPtr _
| TFun _
| TNamed _
| TComp _
| TEnum _
| TBuiltin_va_list _ ->
()

let add side e kind conf vo oo a =
let ty = get_val_type e vo oo in
(* let loc = !Tracing.current_loc in *)
Expand Down
17 changes: 17 additions & 0 deletions tests/regression/04-mutex/68-vla_rc.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#include <pthread.h>
#include <stdio.h>

int g;

void *t_fun(void *arg) {
g=g+1; // RACE!
return NULL;
}

int main(void) {
pthread_t id;
pthread_create(&id, NULL, t_fun, NULL);
int a[g]; // RACE!
int b[2][g]; // RACE!
return 0;
}
17 changes: 17 additions & 0 deletions tests/regression/04-mutex/69-sizeof_rc.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#include <pthread.h>
#include <stdio.h>

int g;

void *t_fun(void *arg) {
g=g+1; // RACE!
return NULL;
}

int main(void) {
pthread_t id;
pthread_create(&id, NULL, t_fun, NULL);
int a = sizeof(int[g]); // RACE!
int b = sizeof(int[2][g]); // RACE!
return 0;
}