Fossil

Check-in [9262546e]
Login

Check-in [9262546e]

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

Overview
Comment:Avoid a valgrind warning in the side-by-side diff logic.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 9262546e4381bed65312dad0de503fff9a194898
User & Date: drh 2012-03-19 11:58:23
Context
2012-03-19
20:33
minor type-cast addition in json timeline SQL. ... (check-in: 70e41ccd user: stephan tags: trunk)
11:58
Avoid a valgrind warning in the side-by-side diff logic. ... (check-in: 9262546e user: drh tags: trunk)
2012-03-18
23:44
Fix compiler warnings and update custom makefile. ... (check-in: 43631b08 user: mistachkin tags: trunk)
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/diff.c.

879
880
881
882
883
884
885

886
887
888
889
890
891
892
  int na, nb;   /* Number of lines shown from A and B */
  int i, j;     /* Loop counters */
  int m, ma, mb;/* Number of lines to output */
  int skip;     /* Number of lines to skip */
  int nChunk = 0; /* Number of chunks of diff output seen so far */
  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;







>







879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
  int na, nb;   /* Number of lines shown from A and B */
  int i, j;     /* Loop counters */
  int m, ma, mb;/* Number of lines to output */
  int skip;     /* Number of lines to skip */
  int nChunk = 0; /* Number of chunks of diff output seen so far */
  SbsLine s;    /* Output line buffer */

  memset(&s, 0, sizeof(s));
  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;