Skip to content

fix(archdocs): three bugs in pssg template helper functions #92

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

Merged
greynewell merged 1 commit into from
Apr 9, 2026
Merged

fix(archdocs): three bugs in pssg template helper functions #92

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
48 changes: 25 additions & 23 deletions internal/archdocs/pssg/render/funcs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"net/url"
"reflect"
"regexp"
"sort"
"strconv"
"strings"

Expand Down Expand Up @@ -141,15 +142,17 @@ func formatNumber(n interface{}) string {

var isoDuration = regexp.MustCompile(`PT(?:(\d+)H)?(?:(\d+)M)?(?:(\d+)S)?`)

// durationMinutes converts an ISO 8601 duration to minutes.
// durationMinutes converts an ISO 8601 duration to minutes, truncating any
// remaining seconds.
func durationMinutes(d string) int {
matches := isoDuration.FindStringSubmatch(d)
if matches == nil {
return 0
}
hours, _ := strconv.Atoi(matches[1])
minutes, _ := strconv.Atoi(matches[2])
return hours*60 + minutes
seconds, _ := strconv.Atoi(matches[3])
return hours*60 + minutes + seconds/60
}

// totalTime adds two ISO 8601 durations.
Expand Down Expand Up @@ -237,32 +240,30 @@ func dict(values ...interface{}) map[string]interface{} {
return result
}

func clampSliceBounds(start, end, length int) (int, int) {
if start < 0 {
start = 0
}
if end > length {
end = length
}
if start > end {
start = end
}
return start, end
Comment on lines +243 to +253
Copy link
Copy Markdown

@coderabbitai coderabbitai bot Apr 9, 2026

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🔴 Critical

clampSliceBounds can still return negative indices and panic.

On Line 250, start = end can make start negative when end < 0 (e.g., slice(s, -1, -1)), which will panic at slice time.
Please clamp both bounds to [0, length] before ordering.

🐛 Suggested fix 
 func clampSliceBounds(start, end, length int) (int, int) {
 	if start < 0 {
 		start = 0
 	}
+	if start > length {
+		start = length
+	}
+	if end < 0 {
+		end = 0
+	}
 	if end > length {
 		end = length
 	}
 	if start > end {
 		start = end
 	}
 	return start, end
 }

Also applies to: 259-266

🤖 Prompt for AI Agents 
Verify each finding against the current code and only fix it if needed.

In `@internal/archdocs/pssg/render/funcs.go` around lines 243 - 253,
clampSliceBounds can return negative indices if end is negative because the code
sets start = end after only clamping end against length; update clampSliceBounds
to first clamp both start and end into the [0, length] range (e.g., if start < 0
then start = 0; if start > length then start = length; same for end) and only
then enforce ordering (if start > end then start = end); apply the same fix to
the other similar function(s) in this file that mirror clampSliceBounds.

}

func sliceHelper(items interface{}, start, end int) interface{} {
switch v := items.(type) {
case []string:
if start < 0 {
start = 0
}
if end > len(v) {
end = len(v)
}
return v[start:end]
s, e := clampSliceBounds(start, end, len(v))
return v[s:e]
case []*entity.Entity:
if start < 0 {
start = 0
}
if end > len(v) {
end = len(v)
}
return v[start:end]
s, e := clampSliceBounds(start, end, len(v))
return v[s:e]
case []interface{}:
if start < 0 {
start = 0
}
if end > len(v) {
end = len(v)
}
return v[start:end]
s, e := clampSliceBounds(start, end, len(v))
return v[s:e]
}
return items
}
Expand All @@ -282,6 +283,7 @@ func length(v interface{}) int {
func sortStrings(s []string) []string {
result := make([]string, len(s))
copy(result, s)
sort.Strings(result)
return result
}

Expand Down
69 changes: 69 additions & 0 deletions internal/archdocs/pssg/render/funcs_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
package render

import (
"testing"
)

func TestDurationMinutes(t *testing.T) {
cases := []struct {
input string
want int
}{
{"PT30M", 30},
{"PT1H", 60},
{"PT1H30M", 90},
{"PT90S", 1}, // 90 seconds → 1 minute (truncated)
{"PT30S", 0}, // 30 seconds → 0 minutes (truncated)
{"PT2H30M45S", 150}, // seconds truncated
{"PT10M30S", 10}, // 10 min 30 sec → 10 min
{"PT0S", 0},
{"", 0},
{"invalid", 0},
}
for _, c := range cases {
got := durationMinutes(c.input)
if got != c.want {
t.Errorf("durationMinutes(%q) = %d, want %d", c.input, got, c.want)
}
}
}

func TestSliceHelper(t *testing.T) {
s := []string{"a", "b", "c"}

// Normal case
got := sliceHelper(s, 0, 2).([]string)
if len(got) != 2 || got[0] != "a" || got[1] != "b" {
t.Errorf("sliceHelper normal: got %v", got)
}

// start > len(v) — must not panic, return empty
got = sliceHelper(s, 5, 10).([]string)
if len(got) != 0 {
t.Errorf("sliceHelper start>len: want empty, got %v", got)
}

// start > end after clamping — must not panic
got = sliceHelper(s, 2, 1).([]string)
if len(got) != 0 {
t.Errorf("sliceHelper start>end: want empty, got %v", got)
}

// negative start
got = sliceHelper(s, -1, 2).([]string)
if len(got) != 2 {
t.Errorf("sliceHelper negative start: got %v", got)
}
}

func TestSortStrings(t *testing.T) {
input := []string{"c", "a", "b"}
got := sortStrings(input)
if got[0] != "a" || got[1] != "b" || got[2] != "c" {
t.Errorf("sortStrings: got %v, want [a b c]", got)
}
// Original must not be modified
if input[0] != "c" {
t.Errorf("sortStrings modified original slice")
}
}
Loading