fix: error handling by replacing SupportsPrebuiltLoaderSet with `S…

…upportsProgramTrie`

cmd/ipsw/cmd/dyld/dyld_image.go

@@ -104,7 +104,9 @@ var ImageCmd = &cobra.Command{
 				if pbl, err := f.GetDylibPrebuiltLoader(image.Name); err == nil {
 					fmt.Println(pbl.String(f))
 				} else {
-					if !errors.Is(err, dyld.ErrPrebuiltLoaderSetNotSupported) {
+					if errors.Is(err, dyld.ErrPrebuiltLoaderSetNotSupported) {
+						log.Warn("prebuilt loader sets not supported for this version of dyld_shared_cache")
+					} else {
 						return fmt.Errorf("failed parsing launch loader sets: %v", err)
 					}
 					// try to parse the dylib closures using the old iOS14.x method
@@ -154,7 +156,9 @@ var ImageCmd = &cobra.Command{
 			if err := f.ForEachLaunchLoaderSetPath(func(execPath string) {
 				fmt.Println(execPath)
 			}); err != nil {
-				if !errors.Is(err, dyld.ErrPrebuiltLoaderSetNotSupported) {
+				if errors.Is(err, dyld.ErrPrebuiltLoaderSetNotSupported) {
+					log.Warn("prebuilt loader sets not supported for this version of dyld_shared_cache")
+				} else {
 					return fmt.Errorf("failed parsing launch loader sets: %v", err)
 				}
 				// try to parse the image array using the old iOS14.x method

internal/commands/dsc/dsc.go

@@ -412,7 +412,7 @@ func GetDylibsThatImport(f *dyld.File, name string) (*ImportedBy, error) {
 		}
 	}
 
-	if f.SupportsPrebuiltLoaderSet() {
+	if f.SupportsProgramTrie() {
 		if err := f.ForEachLaunchLoaderSet(func(execPath string, pset *dyld.PrebuiltLoaderSet) {
 			for _, loader := range pset.Loaders {
 				for _, dep := range loader.Dependents {

pkg/dyld/closure.go

@@ -961,14 +961,7 @@ func (f *File) GetDylibsImageArray() error {
 	var size uint64
 
 	if f.Headers[f.UUID].DylibsImageArrayAddr == 0 {
-		if f.Headers[f.UUID].DylibsPblSetAddr > 0 {
-			return fmt.Errorf("ipsw cannot parse dylibs image array info for macOS12+/iOS15+ yet 😔")
-		}
 		return fmt.Errorf("cache does not contain dylibs image array info")
-		// } else {
-		// 	addr = f.Headers[f.UUID].DylibsPblSetAddr
-		// 	size = f.Headers[f.UUID].ProgramsPblSetPoolAddr - f.Headers[f.UUID].DylibsPblSetAddr
-		// }
 	} else {
 		addr = f.Headers[f.UUID].DylibsImageArrayAddr
 		size = f.Headers[f.UUID].DylibsImageArraySize

pkg/dyld/prebuilt.go

@@ -13,23 +13,19 @@ import (
 	"github.com/blacktop/go-macho/types"
 )
 
-func (f *File) SupportsPrebuiltLoaderSet() bool {
+func (f *File) SupportsProgramTrie() bool {
 	if f.Headers[f.UUID].MappingOffset < uint32(unsafe.Offsetof(f.Headers[f.UUID].ProgramTrieSize)) {
 		return false
 	}
-	// FIXME: REMOVE once I have added iOS 18.x support
-	if f.Headers[f.UUID].MappingOffset > uint32(unsafe.Offsetof(f.Headers[f.UUID].TPROMappingOffset)) {
-		return false
-	}
 	if f.Headers[f.UUID].ProgramTrieAddr == 0 {
 		return false
 	}
 	return true
 }
 
 func (f *File) ForEachLaunchLoaderSet(handler func(execPath string, pset *PrebuiltLoaderSet)) error {
-	if !f.SupportsPrebuiltLoaderSet() {
-		return ErrPrebuiltLoaderSetNotSupported
+	if !f.SupportsProgramTrie() {
+		return ErrProgramTrieNotSupported
 	}
 
 	uuid, off, err := f.GetOffset(f.Headers[f.UUID].ProgramTrieAddr)
@@ -74,8 +70,8 @@ func (f *File) ForEachLaunchLoaderSet(handler func(execPath string, pset *Prebui
 }
 
 func (f *File) ForEachLaunchLoaderSetPath(handler func(execPath string)) error {
-	if !f.SupportsPrebuiltLoaderSet() {
-		return ErrPrebuiltLoaderSetNotSupported
+	if !f.SupportsProgramTrie() {
+		return ErrProgramTrieNotSupported
 	}
 
 	uuid, off, err := f.GetOffset(f.Headers[f.UUID].ProgramTrieAddr)
@@ -104,8 +100,8 @@ func (f *File) ForEachLaunchLoaderSetPath(handler func(execPath string)) error {
 
 // GetLaunchLoaderSet returns the PrebuiltLoaderSet for the given executable app path.
 func (f *File) GetLaunchLoaderSet(executablePath string) (*PrebuiltLoaderSet, error) {
-	if !f.SupportsPrebuiltLoaderSet() {
-		return nil, ErrPrebuiltLoaderSetNotSupported
+	if !f.SupportsProgramTrie() {
+		return nil, ErrProgramTrieNotSupported
 	}
 
 	var psetOffset uint64

pkg/dyld/prebuilt_types.go

@@ -16,6 +16,7 @@ const (
 )
 
 var ErrPrebuiltLoaderSetNotSupported = fmt.Errorf("dyld_shared_cache has no launch prebuilt loader set info")
+var ErrProgramTrieNotSupported = fmt.Errorf("dyld_shared_cache has no program trie info")
 
 type LoaderRef uint16