Skip to content

Fix panic when missing optional fields or descriptor after timezone #555

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix panic when missing optional fields or descriptor after timezone #555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 15 additions & 11 deletions parser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,18 +56,17 @@ type Parser struct {
//
// Examples
//
// // Standard parser without descriptors
// specParser := NewParser(Minute | Hour | Dom | Month | Dow)
// sched, err := specParser.Parse("0 0 15 */3 *")
// // Standard parser without descriptors
// specParser := NewParser(Minute | Hour | Dom | Month | Dow)
// sched, err := specParser.Parse("0 0 15 */3 *")
//
// // Same as above, just excludes time fields
// specParser := NewParser(Dom | Month | Dow)
// sched, err := specParser.Parse("15 */3 *")
//
// // Same as above, just makes Dow optional
// specParser := NewParser(Dom | Month | DowOptional)
// sched, err := specParser.Parse("15 */3")
// // Same as above, just excludes time fields
// specParser := NewParser(Dom | Month | Dow)
// sched, err := specParser.Parse("15 */3 *")
//
// // Same as above, just makes Dow optional
// specParser := NewParser(Dom | Month | DowOptional)
// sched, err := specParser.Parse("15 */3")
func NewParser(options ParseOption) Parser {
optionals := 0
if options&DowOptional > 0 {
Expand Down Expand Up @@ -96,6 +95,9 @@ func (p Parser) Parse(spec string) (Schedule, error) {
var err error
i := strings.Index(spec, " ")
eq := strings.Index(spec, "=")
if i == -1 {
return nil, fmt.Errorf("missing optional fields or descriptor after timezone: %s", spec)
}
if loc, err = time.LoadLocation(spec[eq+1 : i]); err != nil {
return nil, fmt.Errorf("provided bad location %s: %v", spec[eq+1:i], err)
}
Expand Down Expand Up @@ -247,7 +249,9 @@ func getField(field string, r bounds) (uint64, error) {
}

// getRange returns the bits indicated by the given expression:
// number | number "-" number [ "/" number ]
//
// number | number "-" number [ "/" number ]
//
// or error parsing range.
func getRange(expr string, r bounds) (uint64, error) {
var (
Expand Down
22 changes: 22 additions & 0 deletions parser_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,28 @@ func TestNoDescriptorParser(t *testing.T) {
}
}

func TestMissingOptionalFieldsAndDescriptorAfterTimezone(t *testing.T) {
_, err := ParseStandard("TZ=UTC")
if err == nil {
t.Error("expected an error, got none")
}

_, err = ParseStandard("TZ=UTC ")
if err == nil {
t.Error("expected an error, got none")
}

_, err = ParseStandard("TZ=0")
if err == nil {
t.Error("expected an error, got none")
}

_, err = ParseStandard("TZ=0 ")
if err == nil {
t.Error("expected an error, got none")
}
}

func every5min(loc *time.Location) *SpecSchedule {
return &SpecSchedule{1 << 0, 1 << 5, all(hours), all(dom), all(months), all(dow), loc}
}
Expand Down