← Back to branch summary

~yolanda.robla/ubuntu/saucy/clamav/dep-8-tests

« back to all changes in this revision

Viewing changes to shared/cdiff.c

  • Committer: Bazaar Package Importer
  • Author(s): Scott Kitterman
  • Date: 2009-11-02 23:27:19 UTC
  • mfrom: (0.35.9 sid)
  • Revision ID: james.westby@ubuntu.com-20091102232719-61ay35095dhbuxfm
Tags: 0.95.3+dfsg-1ubuntu1
* Merge from debian unstable, remaining changes:
  - Drop build-dep on electric-fence (in Universe)
  - Build-dep on libltdl3-dev instead of libltdl-dev for updating earlier
    releases more easily
  - Add apparmor profiles for clamd and freshclam along with maintainer
    script changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
shared/cdiff.c
623
623
            } while((lines < end_line) && fgets(lbuf, lbuflen, src) && lines++);
624
624
 
625
625
            fclose(dst);
 
626
            dst = NULL;
626
627
            free(dstdb);
627
 
            dstdb = NULL;
628
628
            free(start_str);
629
629
 
630
630
            if(strncmp(lbuf, end_str, strlen(end_str))) {
643
643
        }
644
644
 
645
645
        if(fputs(lbuf, tmp) == EOF) {
 
646
            if(dst) {
 
647
                fclose(dst);
 
648
                free(dstdb);
 
649
                free(start_str);
 
650
                free(end_str);
 
651
            }
646
652
            free(srcdb);
647
653
            fclose(src);
648
654
            fclose(tmp);
656
662
    fclose(src);
657
663
    fclose(tmp);
658
664
 
659
 
    if(dstdb) {
 
665
    if(dst) {
660
666
        fclose(dst);
661
667
        free(start_str);
662
668
        free(end_str);