go/ferret
1
0
Fork 0
mirror of https://github.com/MontFerret/ferret.git synced 2025-07-17 01:32:22 +02:00
Code Issues Releases Activity

Fixed int oveflow for page load timeout

Browse Source
This commit is contained in:
Tim Voronov
2018-11-21 23:11:01 -05:00
parent bf10628875
commit 47a4a18375
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/stdlib/html/document.go
View File

@ -9,8 +9,8 @@ import (
) )
type LoadDocumentArgs struct { type LoadDocumentArgs struct {
Dynamic values.Boolean Dynamic bool
Timeout values.Int Timeout time.Duration
} }
// Page loads a HTML document by a given url. // Page loads a HTML document by a given url.
@ -44,7 +44,7 @@ func Document(ctx context.Context, args ...core.Value) (core.Value, error) {
var drv html.Driver var drv html.Driver
ctx, cancel := context.WithTimeout(ctx, time.Duration(params.Timeout)*time.Millisecond) ctx, cancel := context.WithTimeout(ctx, params.Timeout)
defer cancel() defer cancel()
if params.Dynamic == false { if params.Dynamic == false {
@ -62,7 +62,7 @@ func Document(ctx context.Context, args ...core.Value) (core.Value, error) {
func parseLoadDocumentArgs(args []core.Value) (LoadDocumentArgs, error) { func parseLoadDocumentArgs(args []core.Value) (LoadDocumentArgs, error) {
res := LoadDocumentArgs{ res := LoadDocumentArgs{
Timeout: values.Int(time.Second * 30), Timeout: time.Second * 30,
} }
if len(args) == 3 { if len(args) == 3 {
@ -72,7 +72,7 @@ func parseLoadDocumentArgs(args []core.Value) (LoadDocumentArgs, error) {
return res, err return res, err
} }
res.Dynamic = args[1].(values.Boolean) res.Dynamic = bool(args[1].(values.Boolean))
err = core.ValidateType(args[2], core.IntType) err = core.ValidateType(args[2], core.IntType)
@ -80,7 +80,7 @@ func parseLoadDocumentArgs(args []core.Value) (LoadDocumentArgs, error) {
return res, err return res, err
} }
res.Timeout = args[2].(values.Int) res.Timeout = time.Duration(args[2].(values.Int)) * time.Millisecond
} else if len(args) == 2 { } else if len(args) == 2 {
err := core.ValidateType(args[1], core.BooleanType, core.IntType) err := core.ValidateType(args[1], core.BooleanType, core.IntType)
@ -89,9 +89,9 @@ func parseLoadDocumentArgs(args []core.Value) (LoadDocumentArgs, error) {
} }
if args[1].Type() == core.BooleanType { if args[1].Type() == core.BooleanType {
res.Dynamic = args[1].(values.Boolean) res.Dynamic = bool(args[1].(values.Boolean))
} else { } else {
res.Timeout = args[1].(values.Int) res.Timeout = time.Duration(args[1].(values.Int)) * time.Millisecond
} }
} }