From 912ab43641cb0d9530f2e501358c48e9fe1cf608 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 22 Jun 2020 12:54:12 +0200
Subject: [PATCH] fix [-Werror=format-security]

---
 src/chinese_whispers.cc        | 2 +-
 src/cnn_face_detection.cc      | 5 ++---
 src/face_landmark_detection.cc | 8 ++++----
 src/face_recognition.cc        | 4 ++--
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/chinese_whispers.cc b/src/chinese_whispers.cc
index 026ef13..0653f9b 100644
--- a/src/chinese_whispers.cc
+++ b/src/chinese_whispers.cc
@@ -97,7 +97,7 @@ PHP_FUNCTION(dlib_chinese_whispers)
 		}
 	} catch (exception& e)
 	{
-		zend_throw_exception_ex(zend_ce_exception, 0 TSRMLS_CC, e.what());
+		zend_throw_exception_ex(zend_ce_exception, 0 TSRMLS_CC, "%s", e.what());
 		return;
 	}
 }
diff --git a/src/cnn_face_detection.cc b/src/cnn_face_detection.cc
index 83ea66f..a989e80 100644
--- a/src/cnn_face_detection.cc
+++ b/src/cnn_face_detection.cc
@@ -42,7 +42,7 @@ PHP_METHOD(CnnFaceDetection, __construct)
 		deserialize(cnn_face_detection_model_path) >> *pnet;
 		cfd->net = pnet;
 	} catch (exception& e) {
-		zend_throw_exception_ex(zend_ce_exception, 0 TSRMLS_CC, e.what());
+		zend_throw_exception_ex(zend_ce_exception, 0 TSRMLS_CC, "%s", e.what());
 		return;
 	}
 }
@@ -77,7 +77,6 @@ PHP_METHOD(CnnFaceDetection, detect)
 
 		net_type *pnet = cfd->net;
 		auto dets = (*pnet)(img);
-		int rect_count = 0;
 		array_init(return_value);
 
 		// Scale the detection locations back to the original image size
@@ -101,7 +100,7 @@ PHP_METHOD(CnnFaceDetection, detect)
 	}
 	catch (exception& e)
 	{
-		zend_throw_exception_ex(zend_ce_exception, 0 TSRMLS_CC, e.what());
+		zend_throw_exception_ex(zend_ce_exception, 0 TSRMLS_CC, "%s", e.what());
 		return;
 	}
 }
diff --git a/src/face_landmark_detection.cc b/src/face_landmark_detection.cc
index 8336964..51139f6 100644
--- a/src/face_landmark_detection.cc
+++ b/src/face_landmark_detection.cc
@@ -52,7 +52,7 @@ PHP_FUNCTION(dlib_face_landmark_detection)
 
             zval ARRAY_NAME_WITH_INDEX(face, j);
             array_init(&ARRAY_NAME_WITH_INDEX(face, j));
-            for (int k = 0; k < shape.num_parts(); k++) {
+            for (unsigned int k = 0; k < shape.num_parts(); k++) {
                 zval ARRAY_NAME_WITH_INDEX(part, k);
                 array_init(&ARRAY_NAME_WITH_INDEX(part, k));
                 dlib::point p = shape.part(k);
@@ -95,7 +95,7 @@ PHP_METHOD(FaceLandmarkDetection, __construct)
         fld->sp = new shape_predictor;
         deserialize(shape_predictor_file_path) >> *(fld->sp);
     } catch (exception& e) {
-        zend_throw_exception_ex(zend_ce_exception, 0 TSRMLS_CC, e.what());
+        zend_throw_exception_ex(zend_ce_exception, 0 TSRMLS_CC, "%s", e.what());
         return;
     }
 }
@@ -151,7 +151,7 @@ PHP_METHOD(FaceLandmarkDetection, detect)
         array_init(&rect_arr);
         array_init(&parts_arr);
 
-        for (int i = 0; i < shape.num_parts(); i++) {
+        for (unsigned int i = 0; i < shape.num_parts(); i++) {
             zval part;
             array_init(&part);
             dlib::point p = shape.part(i);
@@ -169,7 +169,7 @@ PHP_METHOD(FaceLandmarkDetection, detect)
         add_assoc_zval(return_value, "rect", &rect_arr);
         add_assoc_zval(return_value, "parts", &parts_arr);
     } catch (exception& e) {
-        zend_throw_exception_ex(zend_ce_exception, 0 TSRMLS_CC, e.what());
+        zend_throw_exception_ex(zend_ce_exception, 0 TSRMLS_CC, "%s", e.what());
         return;
     }
 }
diff --git a/src/face_recognition.cc b/src/face_recognition.cc
index 99a3d97..401e964 100644
--- a/src/face_recognition.cc
+++ b/src/face_recognition.cc
@@ -37,7 +37,7 @@ PHP_METHOD(FaceRecognition, __construct)
         fr->net = new anet_type;
         deserialize(face_recognition_model_path) >> *(fr->net);
     } catch (exception& e) {
-        zend_throw_exception_ex(zend_ce_exception, 0 TSRMLS_CC, e.what());
+        zend_throw_exception_ex(zend_ce_exception, 0 TSRMLS_CC, "%s", e.what());
         return;
     }
 }
@@ -183,7 +183,7 @@ PHP_METHOD(FaceRecognition, computeDescriptor)
             add_next_index_double(return_value, d);
         }
     } catch (exception& e) {
-        zend_throw_exception_ex(zend_ce_exception, 0 TSRMLS_CC, e.what());
+        zend_throw_exception_ex(zend_ce_exception, 0 TSRMLS_CC, "%s", e.what());
         return;
     }
 }