Skip to content

Cwe 190 #1057

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
asfgit merged 2 commits into from
Dec 6, 2015
Merged

Cwe 190 #1057

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4c5cd4
Merge pull request #2 from rafaelweingartner/CWE-190
DaanHoogland Nov 20, 2015
4b7f87b
move back to original contract of isNetworksOverlap()
DaanHoogland Nov 21, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions utils/src/main/java/com/cloud/utils/net/NetUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1170,14 +1170,15 @@ public static boolean verifyInstanceName(final String instanceName) {
}

public static boolean isNetworksOverlap(final String cidrA, final String cidrB) {
if (!areCidrsNotEmpty(cidrA, cidrB)) {
return false;
try {
Long[] cidrALong = cidrToLong(cidrA);
Long[] cidrBLong = cidrToLong(cidrB);
final long shift = MAX_CIDR - (cidrALong[1] > cidrBLong[1] ? cidrBLong[1] : cidrALong[1]);
return cidrALong[0] >> shift == cidrBLong[0] >> shift;
} catch (CloudRuntimeException e) {
s_logger.error(e.getLocalizedMessage(),e);
}
Long[] cidrALong = cidrToLong(cidrA);
Long[] cidrBLong = cidrToLong(cidrB);

final long shift = MAX_CIDR - (cidrALong[1] > cidrBLong[1] ? cidrBLong[1] : cidrALong[1]);
return cidrALong[0] >> shift == cidrBLong[0] >> shift;
return false;
}

public static boolean isValidS2SVpnPolicy(final String policys) {
Expand Down