CFX_MapByteStringToPtr considered harmful.

fpdfsdk/include/fsdk_annothandler.h

Index: fpdfsdk/include/fsdk_annothandler.h
diff --git a/fpdfsdk/include/fsdk_annothandler.h b/fpdfsdk/include/fsdk_annothandler.h
index 8bcf116e4517127f3d54e37bb197663cbf6cda63..e20022eccf7920ca2ca7b272301599013afd83a0 100644
--- a/fpdfsdk/include/fsdk_annothandler.h
+++ b/fpdfsdk/include/fsdk_annothandler.h
@@ -7,6 +7,8 @@
 #ifndef FPDFSDK_INCLUDE_FSDK_ANNOTHANDLER_H_
 #define FPDFSDK_INCLUDE_FSDK_ANNOTHANDLER_H_
 
+#include <map>
+
 #include "../../core/include/fxcrt/fx_basic.h"
 
 class CFFL_IFormFiller;
@@ -316,7 +318,7 @@ class CPDFSDK_AnnotHandlerMgr {
 
  private:
   CBA_AnnotHandlerArray m_Handlers;

[Lei Zhang, 2015/08/15 00:35:44]

Can we just get rid of |m_Handlers| and give ownership of the handlers to
|m_mapType2Handler|?

[Tom Sepez, 2015/08/17 20:15:26]

Follow-up.

-  CFX_MapByteStringToPtr m_mapType2Handler;
+  std::map<CFX_ByteString, IPDFSDK_AnnotHandler*> m_mapType2Handler;
   CPDFDoc_Environment* m_pApp;
 };