Merge ed975ef into f05f1c8

SaschaCowley · web-flow · commit f32caa0e3932 · 2024-07-30T02:19:06.000Z
diff --git a/source/NVDAObjects/IAccessible/__init__.py b/source/NVDAObjects/IAccessible/__init__.py
@@ -275,6 +275,13 @@ def _getCaretOffset(self):
 		return offset
 
 	def _setCaretOffset(self, offset):
+		iaTextObject = self.obj.IAccessibleTextObject
+		if offset > (nCharacters := iaTextObject.nCharacters):
+			log.debugWarning(
+				f"{offset=} is greater than IAccessibleText::{nCharacters=}. Clamping to {nCharacters}.",
+				stack_info=True,
+			)
+			offset = nCharacters
 		self.obj.IAccessibleTextObject.SetCaretOffset(offset)
 
 	def _getSelectionOffsets(self):
diff --git a/source/NVDAObjects/IAccessible/ia2TextMozilla.py b/source/NVDAObjects/IAccessible/ia2TextMozilla.py
@@ -687,6 +687,8 @@ def _findNextContent(self, origin, moveBack=False, limitToInline=False):
 	def move(self, unit, direction, endPoint=None):
 		if direction == 0:
 			return 0
+		if self._makeRawTextInfo(self.obj, textInfos.POSITION_ALL)._getStoryLength() == 0:
+			return 0
 
 		if not endPoint or endPoint == "start":
 			moveTi = self._start
