Cellular: ATHandler's mem_str fixed to work on matching strings

Mirela Chirica · Mirela Chirica · commit 4e6cbb8f5f94 · 2018-10-29T13:33:10.000+02:00
diff --git a/features/cellular/framework/AT/ATHandler.cpp b/features/cellular/framework/AT/ATHandler.cpp
@@ -1035,7 +1035,7 @@ void ATHandler::set_string(char *dest, const char *src, size_t src_len)
 
 const char *ATHandler::mem_str(const char *dest, size_t dest_len, const char *src, size_t src_len)
 {
-    if (dest_len > src_len) {
+    if (dest_len >= src_len) {
         for (size_t i = 0; i < dest_len - src_len + 1; ++i) {
             if (memcmp(dest + i, src, src_len) == 0) {
                 return dest + i;

Original file line number	Diff line number	Diff line change
`@@ -1035,7 +1035,7 @@ void ATHandler::set_string(char dest, const char src, size_t src_len)`
`1035`	`1035`
`1036`	`1036`	`const char ATHandler::mem_str(const char dest, size_t dest_len, const char *src, size_t src_len)`
`1037`	`1037`	`{`
`1038`		`- if (dest_len > src_len) {`
	`1038`	`+ if (dest_len >= src_len) {`
`1039`	`1039`	`for (size_t i = 0; i < dest_len - src_len + 1; ++i) {`
`1040`	`1040`	`if (memcmp(dest + i, src, src_len) == 0) {`
`1041`	`1041`	`return dest + i;`