← Back to branch summary

~ubuntu-branches/ubuntu/natty/clamav/natty-security

« back to all changes in this revision

Viewing changes to libclamav/c++/ClamBCRTChecks.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Scott Kitterman
  • Date: 2011-02-19 09:51:33 UTC
  • mfrom: (0.35.19 sid)
  • Revision ID: james.westby@ubuntu.com-20110219095133-sde2dyj8a6bjbkdh
Tags: 0.97+dfsg-0ubuntu1
* Merge from debian unstable (0ubuntu1 because the Debian upload was
  inadvertently left marked UNRELEASED).  Remaining changes:
  - Drop initial signature definitions from clamav-base
  - Drop build-dep on electric-fence (in Universe)
  - Add apparmor profiles for clamd and freshclam along with maintainer
    script changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
libclamav/c++/ClamBCRTChecks.cpp
117
117
 
118
118
      std::vector<Instruction*> insns;
119
119
 
 
120
      BasicBlock *LastBB = 0;
 
121
      bool skip = false;
120
122
      for (inst_iterator I=inst_begin(F),E=inst_end(F); I != E;++I) {
121
123
        Instruction *II = &*I;
 
124
        if (II->getParent() != LastBB) {
 
125
            LastBB = II->getParent();
 
126
            skip = DT->getNode(LastBB) == 0;
 
127
        }
 
128
        if (skip)
 
129
            continue;
122
130
        if (isa<LoadInst>(II) || isa<StoreInst>(II) || isa<MemIntrinsic>(II))
123
131
          insns.push_back(II);
124
132
        if (CallInst *CI = dyn_cast<CallInst>(II)) {