Fossil SCM

Detect binary files that look like text but end with a sequence of zeros.

drh 2016-10-04 02:16 trunk
Commit 0e0e29aea0e11dd5546339ea59e954400196a136
1 file changed +1 -1
+1 -1
--- src/diff.c
+++ src/diff.c
@@ -149,12 +149,12 @@
149149
*/
150150
for(nLine=0, z2=z; (zNL = strchr(z2,'\n'))!=0; z2=zNL+1, nLine++){}
151151
if( z2[0]!=0 ){
152152
nLine++;
153153
do{ z2++; }while( z2[0] );
154
- if( n!=(int)(z2-z) ) return 0;
155154
}
155
+ if( n!=(int)(z2-z) ) return 0;
156156
157157
a = fossil_malloc( sizeof(a[0])*nLine );
158158
memset(a, 0, sizeof(a[0])*nLine);
159159
if( nLine==0 ){
160160
*pnLine = 0;
161161
--- src/diff.c
+++ src/diff.c
@@ -149,12 +149,12 @@
149 */
150 for(nLine=0, z2=z; (zNL = strchr(z2,'\n'))!=0; z2=zNL+1, nLine++){}
151 if( z2[0]!=0 ){
152 nLine++;
153 do{ z2++; }while( z2[0] );
154 if( n!=(int)(z2-z) ) return 0;
155 }
 
156
157 a = fossil_malloc( sizeof(a[0])*nLine );
158 memset(a, 0, sizeof(a[0])*nLine);
159 if( nLine==0 ){
160 *pnLine = 0;
161
--- src/diff.c
+++ src/diff.c
@@ -149,12 +149,12 @@
149 */
150 for(nLine=0, z2=z; (zNL = strchr(z2,'\n'))!=0; z2=zNL+1, nLine++){}
151 if( z2[0]!=0 ){
152 nLine++;
153 do{ z2++; }while( z2[0] );
 
154 }
155 if( n!=(int)(z2-z) ) return 0;
156
157 a = fossil_malloc( sizeof(a[0])*nLine );
158 memset(a, 0, sizeof(a[0])*nLine);
159 if( nLine==0 ){
160 *pnLine = 0;
161

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button