Skip to content

fix panic in addControlDescriptions() #88

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

Closed
wants to merge 2 commits into from
Closed

fix panic in addControlDescriptions() #88

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dee83a3
fix panic in addControlDescriptions()
vetinari Aug 15, 2016
cdce327
fixes
vetinari Aug 16, 2016
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
32 changes: 27 additions & 5 deletions ldap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,15 +153,37 @@ func addLDAPDescriptions(packet *ber.Packet) (err error) {
func addControlDescriptions(packet *ber.Packet) {
packet.Description = "Controls"
for _, child := range packet.Children {
var value *ber.Packet
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we do the same thing here where we declare controlType := "", set it inside the cases, then switch on controlType instead of child.Children[0].Value.(string)?

child.Description = "Control"
child.Children[0].Description = "Control Type (" + ControlTypeMap[child.Children[0].Value.(string)] + ")"
value := child.Children[1]
if len(child.Children) == 3 {
switch len(child.Children) {
case 0:
// at least one child is required for control type
continue
case 1:
// just type, no criticality or value
child.Children[0].Description = "Control Type (" + ControlTypeMap[child.Children[0].Value.(string)] + ")"
case 2:
child.Children[0].Description = "Control Type (" + ControlTypeMap[child.Children[0].Value.(string)] + ")"
if _, ok := packet.Children[1].Value.(bool); ok {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same comment here as in the decoding code would be helpful... this is a little dense

child.Children[1].Description = "Criticality"
} else {
child.Children[1].Description = "Control Value"
value = child.Children[1]
}

case 3:
child.Children[0].Description = "Control Type (" + ControlTypeMap[child.Children[0].Value.(string)] + ")"
child.Children[1].Description = "Criticality"
child.Children[2].Description = "Control Value"
value = child.Children[2]
}
value.Description = "Control Value"

default:
// more than 3 children is invalid
continue
}
if value == nil {
continue
}
switch child.Children[0].Value.(string) {
case ControlTypePaging:
value.Description += " (Paging)"
Expand Down