Skip to content

Commit 5ed7056

Browse files
authored
C++: remove deprecation from getMaxData
1 parent 3734e1c commit 5ed7056

File tree

1 file changed

+10
-12
lines changed

1 file changed

+10
-12
lines changed

cpp/ql/lib/semmle/code/cpp/security/BufferWrite.qll

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,8 @@ abstract class BufferWrite extends Expr {
6868
/**
6969
* Gets an upper bound to the amount of data that's being written (if one
7070
* can be found).
71-
* DEPRECATED: `getMaxData/1` should be used and overridden instead.
7271
*/
73-
deprecated int getMaxData() { none() }
72+
int getMaxData() { none() }
7473

7574
/**
7675
* Gets an upper bound to the amount of data that's being written (if one
@@ -85,9 +84,8 @@ abstract class BufferWrite extends Expr {
8584
* can be found), except that float to string conversions are assumed to be
8685
* much smaller (8 bytes) than their true maximum length. This can be
8786
* helpful in determining the cause of a buffer overflow issue.
88-
* DEPRECATED: `getMaxDataLimited/1` should be used and overridden instead.
8987
*/
90-
deprecated int getMaxDataLimited() { result = getMaxData() }
88+
int getMaxDataLimited() { result = getMaxData() }
9189

9290
/**
9391
* Gets an upper bound to the amount of data that's being written (if one
@@ -163,7 +161,7 @@ class StrCopyBW extends BufferWriteCall {
163161

164162
override int getMaxData(BufferWriteEstimationReason reason) { result = getMaxDataImpl(reason) }
165163

166-
deprecated override int getMaxData() { result = max(getMaxDataImpl(_)) }
164+
override int getMaxData() { result = max(getMaxDataImpl(_)) }
167165
}
168166

169167
/**
@@ -207,7 +205,7 @@ class StrCatBW extends BufferWriteCall {
207205

208206
override int getMaxData(BufferWriteEstimationReason reason) { result = getMaxDataImpl(reason) }
209207

210-
deprecated override int getMaxData() { result = max(getMaxDataImpl(_)) }
208+
override int getMaxData() { result = max(getMaxDataImpl(_)) }
211209
}
212210

213211
/**
@@ -273,7 +271,7 @@ class SprintfBW extends BufferWriteCall {
273271

274272
override int getMaxData(BufferWriteEstimationReason reason) { result = getMaxDataImpl(reason) }
275273

276-
deprecated override int getMaxData() { result = max(getMaxDataImpl(_)) }
274+
override int getMaxData() { result = max(getMaxDataImpl(_)) }
277275

278276
private int getMaxDataLimitedImpl(BufferWriteEstimationReason reason) {
279277
exists(FormatLiteral fl |
@@ -286,7 +284,7 @@ class SprintfBW extends BufferWriteCall {
286284
result = getMaxDataLimitedImpl(reason)
287285
}
288286

289-
deprecated override int getMaxDataLimited() { result = max(getMaxDataLimitedImpl(_)) }
287+
override int getMaxDataLimited() { result = max(getMaxDataLimitedImpl(_)) }
290288
}
291289

292290
/**
@@ -386,7 +384,7 @@ class SnprintfBW extends BufferWriteCall {
386384

387385
override int getMaxData(BufferWriteEstimationReason reason) { result = getMaxDataImpl(reason) }
388386

389-
deprecated override int getMaxData() { result = max(getMaxDataImpl(_)) }
387+
override int getMaxData() { result = max(getMaxDataImpl(_)) }
390388

391389
private int getMaxDataLimitedImpl(BufferWriteEstimationReason reason) {
392390
exists(FormatLiteral fl |
@@ -399,7 +397,7 @@ class SnprintfBW extends BufferWriteCall {
399397
result = getMaxDataLimitedImpl(reason)
400398
}
401399

402-
deprecated override int getMaxDataLimited() { result = max(getMaxDataLimitedImpl(_)) }
400+
override int getMaxDataLimited() { result = max(getMaxDataLimitedImpl(_)) }
403401
}
404402

405403
/**
@@ -499,7 +497,7 @@ class ScanfBW extends BufferWrite {
499497

500498
override int getMaxData(BufferWriteEstimationReason reason) { result = getMaxDataImpl(reason) }
501499

502-
deprecated override int getMaxData() { result = max(getMaxDataImpl(_)) }
500+
override int getMaxData() { result = max(getMaxDataImpl(_)) }
503501

504502
override string getBWDesc() {
505503
exists(FunctionCall fc |
@@ -540,5 +538,5 @@ class RealpathBW extends BufferWriteCall {
540538

541539
override int getMaxData(BufferWriteEstimationReason reason) { result = getMaxDataImpl(reason) }
542540

543-
deprecated override int getMaxData() { result = max(getMaxDataImpl(_)) }
541+
override int getMaxData() { result = max(getMaxDataImpl(_)) }
544542
}

0 commit comments

Comments
 (0)