# HG changeset patch # User Simon Whitaker # Date 2017-10-01 11:54:35 # Node ID b6692ba7d5b04d841071fb35eb28faf801e5bb95 # Parent 0133ca39c68875e1d50e6ed48913e33e1f8f15ac obsmarker: crash more helpfully when metadata fields are >255bytes (issue5681) Various mutators fail when attempting to write obsmarkers with metadata fields longer than 255 bytes, since the length of mwetadata fields is stored in u8s. This change raises a more helpful error in such circumstances. Differential Revision: https://phab.mercurial-scm.org/D865 diff --git a/mercurial/obsolete.py b/mercurial/obsolete.py --- a/mercurial/obsolete.py +++ b/mercurial/obsolete.py @@ -416,6 +416,14 @@ def _fm1encodeonemarker(marker): for key, value in metadata: lk = len(key) lv = len(value) + if lk > 255: + msg = ('obsstore metadata key cannot be longer than 255 bytes' + ' (key "%s" is %u bytes)') % (key, lk) + raise error.ProgrammingError(msg) + if lv > 255: + msg = ('obsstore metadata value cannot be longer than 255 bytes' + ' (value "%s" for key "%s" is %u bytes)') % (value, key, lv) + raise error.ProgrammingError(msg) data.append(lk) data.append(lv) totalsize += lk + lv diff --git a/tests/test-obsolete-bounds-checking.t b/tests/test-obsolete-bounds-checking.t new file mode 100644 --- /dev/null +++ b/tests/test-obsolete-bounds-checking.t @@ -0,0 +1,23 @@ +Create a repo, set the username to something more than 255 bytes, then run hg amend on it. + + $ unset HGUSER + $ cat >> $HGRCPATH << EOF + > [ui] + > username = aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + > [extensions] + > amend = + > [experimental] + > stabilization=createmarkers,exchange + > EOF + $ hg init tmpa + $ cd tmpa + $ echo a > a + $ hg add + adding a + $ hg commit -m "Initial commit" + $ echo a >> a + $ hg amend 2>&1 | egrep -v '^(\*\*| )' + transaction abort! + rollback completed + Traceback (most recent call last): + mercurial.error.ProgrammingError: obsstore metadata value cannot be longer than 255 bytes (value "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa " for key "user" is 285 bytes)