Fossil

Check-in [92b2a5c3]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fixing a jump on uninitialized data on web sbs diff. Noticed after having seen text file corruption in the web SBS, and traced by valgrind.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | annotate_links
Files: files | file ages | folders
SHA1: 92b2a5c390467a183828aad688fabf57148c5d96
User & Date: viriketo 2012-04-04 16:19:43
References
2012-04-06
17:24
(1) Show cherrypick and backout merges in the status command (2) Allow partial commits of cherrypick and backout merges (3) Prompt user to continue if a check-in comment is unedited (4) Fixing a jump on uninitialized data on web sbs diff - cherrypick of [92b2a5c390467a] (5) Updates against an uncommitted merge are now a warning, not a fatal error. check-in: 195517a9 user: drh tags: trunk
Context
2012-04-04
16:20
Updating from trunk to get the latest trunk fixes. check-in: b7f3a32d user: viriketo tags: annotate_links
16:19
Fixing a jump on uninitialized data on web sbs diff. Noticed after having seen text file corruption in the web SBS, and traced by valgrind. check-in: 92b2a5c3 user: viriketo tags: annotate_links
2012-03-18
19:46
Fixing an unnecessary heap accumulation. check-in: 801a7595 user: viriketo tags: annotate_links
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/diff.c.

889
890
891
892
893
894
895

896
897
898
899
900
901
902
  SbsLine s;    /* Output line buffer */

  s.zLine = fossil_malloc( 10*width + 200 );
  if( s.zLine==0 ) return;
  s.width = width;
  s.escHtml = escHtml;
  s.iStart = -1;

  s.iEnd = -1;
  A = p->aFrom;
  B = p->aTo;
  R = p->aEdit;
  mxr = p->nEdit;
  while( mxr>2 && R[mxr-1]==0 && R[mxr-2]==0 ){ mxr -= 3; }
  for(r=0; r<mxr; r += 3*nr){







>







889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
  SbsLine s;    /* Output line buffer */

  s.zLine = fossil_malloc( 10*width + 200 );
  if( s.zLine==0 ) return;
  s.width = width;
  s.escHtml = escHtml;
  s.iStart = -1;
  s.iStart2 = 0;
  s.iEnd = -1;
  A = p->aFrom;
  B = p->aTo;
  R = p->aEdit;
  mxr = p->nEdit;
  while( mxr>2 && R[mxr-1]==0 && R[mxr-2]==0 ){ mxr -= 3; }
  for(r=0; r<mxr; r += 3*nr){