reactos/syzkaller
1
0
Fork 0
mirror of https://github.com/reactos/syzkaller.git synced 2024-11-23 19:39:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

prog: reuse defaultArg

Browse Source 
Reuse defaultArg in generateArg. There is code that does the same.
Also, don't generate pointer value for output arguments.
This commit is contained in:
Dmitry Vyukov 2017-08-09 10:35:56 +02:00
parent 9e56135d0d
commit 0939075822
2 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
prog/prog.go
View File

@ -292,7 +292,7 @@ func defaultArg(t sys.Type) Arg {
return pointerArg(t, 0, 0, 1, nil)
case *sys.PtrType:
var res Arg
if !t.Optional() {
if !t.Optional() && t.Dir() != sys.DirOut {
res = defaultArg(typ.Type)
}
return pointerArg(t, 0, 0, 0, res)

20
prog/rand.go
View File

@ -608,26 +608,14 @@ func (r *randGen) generateArg(s *state, typ sys.Type) (arg Arg, calls []*Call) {
// in subsequent calls. For the same reason we do generate pointer/array/struct
// output arguments (their elements can be referenced in subsequent calls).
switch typ.(type) {
case *sys.IntType, *sys.FlagsType, *sys.ConstType, *sys.ProcType:
return constArg(typ, typ.Default()), nil
case *sys.VmaType:
return pointerArg(typ, 0, 0, 0, nil), nil
case *sys.ResourceType:
return resultArg(typ, nil, typ.Default()), nil
case *sys.IntType, *sys.FlagsType, *sys.ConstType, *sys.ProcType,
*sys.VmaType, *sys.ResourceType:
return defaultArg(typ), nil
}
}
if typ.Optional() && r.oneOf(5) {
switch typ.(type) {
case *sys.PtrType:
return pointerArg(typ, 0, 0, 0, nil), nil
case *sys.BufferType:
panic("impossible") // parent PtrType must be Optional instead
case *sys.VmaType:
return pointerArg(typ, 0, 0, 0, nil), nil
default:
return constArg(typ, typ.Default()), nil
}
return defaultArg(typ), nil
}
// Allow infinite recursion for optional pointers.